OSDN Git Service

gobex: Split unit tests into separate modules
authorJohan Hedberg <johan.hedberg@intel.com>
Tue, 28 Jun 2011 21:11:54 +0000 (00:11 +0300)
committerMarcel Holtmann <marcel@holtmann.org>
Tue, 4 Dec 2012 21:21:57 +0000 (22:21 +0100)
unit/test-gobex-header.c [new file with mode: 0644]
unit/test-gobex-packet.c [new file with mode: 0644]
unit/test-gobex.c
unit/util.c [new file with mode: 0644]
unit/util.h [new file with mode: 0644]

diff --git a/unit/test-gobex-header.c b/unit/test-gobex-header.c
new file mode 100644 (file)
index 0000000..4185a70
--- /dev/null
@@ -0,0 +1,393 @@
+/*
+ *
+ *  OBEX library with GLib integration
+ *
+ *  Copyright (C) 2011  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 version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+#include <stdint.h>
+
+#include <gobex/gobex-header.h>
+
+#include "util.h"
+
+static uint8_t hdr_connid[] = { G_OBEX_HDR_ID_CONNECTION, 1, 2, 3, 4 };
+static uint8_t hdr_name_ascii[] = { G_OBEX_HDR_ID_NAME, 0x00, 0x0b,
+                               0x00, 'f', 0x00, 'o', 0x00, 'o',
+                               0x00, 0x00 };
+static uint8_t hdr_name_umlaut[] = { G_OBEX_HDR_ID_NAME, 0x00, 0x0b,
+                               0x00, 0xe5, 0x00, 0xe4, 0x00, 0xf6,
+                               0x00, 0x00 };
+static uint8_t hdr_body[] = { G_OBEX_HDR_ID_BODY, 0x00, 0x07, 1, 2, 3, 4 };
+static uint8_t hdr_actionid[] = { G_OBEX_HDR_ID_ACTION, 0xab };
+
+static void test_header_name_ascii(void)
+{
+       GObexHeader *header;
+       uint8_t buf[1024];
+       size_t len;
+
+       header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "foo");
+
+       g_assert(header != NULL);
+
+       len = g_obex_header_encode(header, buf, sizeof(buf));
+
+       assert_memequal(hdr_name_ascii, sizeof(hdr_name_ascii), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_name_umlaut(void)
+{
+       GObexHeader *header;
+       uint8_t buf[1024];
+       size_t len;
+
+       header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "åäö");
+
+       g_assert(header != NULL);
+
+       len = g_obex_header_encode(header, buf, sizeof(buf));
+
+       assert_memequal(hdr_name_umlaut, sizeof(hdr_name_umlaut), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_bytes(void)
+{
+       GObexHeader *header;
+       uint8_t buf[1024], data[] = { 1, 2, 3, 4 };
+       size_t len;
+
+       header = g_obex_header_new_bytes(G_OBEX_HDR_ID_BODY, data,
+                                               sizeof(data), G_OBEX_DATA_REF);
+       g_assert(header != NULL);
+
+       len = g_obex_header_encode(header, buf, sizeof(buf));
+
+       assert_memequal(hdr_body, sizeof(hdr_body), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_uint8(void)
+{
+       GObexHeader *header;
+       uint8_t buf[1024];
+       size_t len;
+
+       header = g_obex_header_new_uint8(G_OBEX_HDR_ID_ACTION, 0xab);
+
+       g_assert(header != NULL);
+
+       len = g_obex_header_encode(header, buf, sizeof(buf));
+
+       assert_memequal(hdr_actionid, sizeof(hdr_actionid), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_uint32(void)
+{
+       GObexHeader *header;
+       uint8_t buf[1024];
+       size_t len;
+
+       header = g_obex_header_new_uint32(G_OBEX_HDR_ID_CONNECTION,
+                                                               0x01020304);
+
+       len = g_obex_header_encode(header, buf, sizeof(buf));
+
+       assert_memequal(hdr_connid, sizeof(hdr_connid), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static GObexHeader *parse_and_encode(uint8_t *buf, size_t buf_len)
+{
+       GObexHeader *header;
+       uint8_t encoded[1024];
+       size_t len;
+
+       header = g_obex_header_decode(buf, buf_len, G_OBEX_DATA_REF, &len);
+       g_assert(header != NULL);
+       g_assert_cmpuint(len, ==, buf_len);
+
+       len = g_obex_header_encode(header, encoded, sizeof(encoded));
+
+       assert_memequal(buf, buf_len, encoded, len);
+
+       return header;
+}
+
+static void test_header_encode_connid(void)
+{
+       GObexHeader *header;
+       gboolean ret;
+       guint32 val;
+
+       header = parse_and_encode(hdr_connid, sizeof(hdr_connid));
+
+       ret = g_obex_header_get_uint32(header, &val);
+
+       g_assert(ret == TRUE);
+       g_assert(val == 0x01020304);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_encode_name_ascii(void)
+{
+       GObexHeader *header;
+       const char *str;
+       gboolean ret;
+
+       header = parse_and_encode(hdr_name_ascii, sizeof(hdr_name_ascii));
+
+       ret = g_obex_header_get_unicode(header, &str);
+
+       g_assert(ret == TRUE);
+       g_assert_cmpstr(str, ==, "foo");
+
+       g_obex_header_free(header);
+}
+
+static void test_header_encode_name_umlaut(void)
+{
+       GObexHeader *header;
+       const char *str;
+       gboolean ret;
+
+       header = parse_and_encode(hdr_name_umlaut, sizeof(hdr_name_umlaut));
+
+       ret = g_obex_header_get_unicode(header, &str);
+
+       g_assert(ret == TRUE);
+       g_assert_cmpstr(str, ==, "åäö");
+
+       g_obex_header_free(header);
+}
+
+static void test_header_encode_body(void)
+{
+       GObexHeader *header;
+       guint8 expected[] = { 1, 2, 3, 4};
+       const guint8 *buf;
+       size_t len;
+       gboolean ret;
+
+       header = parse_and_encode(hdr_body, sizeof(hdr_body));
+
+       ret = g_obex_header_get_bytes(header, &buf, &len);
+
+       g_assert(ret == TRUE);
+       assert_memequal(expected, sizeof(expected), buf, len);
+
+       g_obex_header_free(header);
+}
+
+static void test_header_encode_actionid(void)
+{
+       GObexHeader *header;
+       gboolean ret;
+       guint8 val;
+
+       header = parse_and_encode(hdr_actionid, sizeof(hdr_actionid));
+
+       ret = g_obex_header_get_uint8(header, &val);
+
+       g_assert(ret == TRUE);
+       g_assert_cmpuint(val, ==, 0xab);
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_connid(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_connid, sizeof(hdr_connid),
+                                               G_OBEX_DATA_REF, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_connid));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_name_ascii(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_name_ascii, sizeof(hdr_name_ascii),
+                                               G_OBEX_DATA_REF, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_ascii));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_name_umlaut(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_name_umlaut, sizeof(hdr_name_umlaut),
+                                               G_OBEX_DATA_REF, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_umlaut));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_body(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_body, sizeof(hdr_body),
+                                               G_OBEX_DATA_COPY, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_body_extdata(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_body, sizeof(hdr_body),
+                                               G_OBEX_DATA_REF, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_actionid(void)
+{
+       GObexHeader *header;
+       size_t parsed;
+
+       header = g_obex_header_decode(hdr_actionid, sizeof(hdr_actionid),
+                                               G_OBEX_DATA_REF, &parsed);
+       g_assert(header != NULL);
+
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_actionid));
+
+       g_obex_header_free(header);
+}
+
+static void test_decode_header_multi(void)
+{
+       GObexHeader *header;
+       GByteArray *buf;
+       size_t parsed;
+
+       buf = g_byte_array_sized_new(sizeof(hdr_connid) +
+                                       sizeof(hdr_name_ascii) +
+                                       sizeof(hdr_actionid) +
+                                       sizeof(hdr_body));
+
+       g_byte_array_append(buf, hdr_connid, sizeof(hdr_connid));
+       g_byte_array_append(buf, hdr_name_ascii, sizeof(hdr_name_ascii));
+       g_byte_array_append(buf, hdr_actionid, sizeof(hdr_actionid));
+       g_byte_array_append(buf, hdr_body, sizeof(hdr_body));
+
+       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
+                                                               &parsed);
+       g_assert(header != NULL);
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_connid));
+       g_byte_array_remove_range(buf, 0, parsed);
+       g_obex_header_free(header);
+
+       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
+                                                               &parsed);
+       g_assert(header != NULL);
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_ascii));
+       g_byte_array_remove_range(buf, 0, parsed);
+       g_obex_header_free(header);
+
+       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
+                                                               &parsed);
+       g_assert(header != NULL);
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_actionid));
+       g_byte_array_remove_range(buf, 0, parsed);
+       g_obex_header_free(header);
+
+       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
+                                                               &parsed);
+       g_assert(header != NULL);
+       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
+       g_byte_array_remove_range(buf, 0, parsed);
+       g_obex_header_free(header);
+
+       g_byte_array_unref(buf);
+}
+
+int main(int argc, char *argv[])
+{
+       g_test_init(&argc, &argv, NULL);
+
+       g_test_add_func("/gobex/test_decode_header_connid",
+                                               test_decode_header_connid);
+       g_test_add_func("/gobex/test_decode_header_name_ascii",
+                                       test_decode_header_name_ascii);
+       g_test_add_func("/gobex/test_decode_header_name_umlaut",
+                                       test_decode_header_name_umlaut);
+       g_test_add_func("/gobex/test_decode_header_body",
+                                               test_decode_header_body);
+       g_test_add_func("/gobex/test_decode_header_body_extdata",
+                                       test_decode_header_body_extdata);
+       g_test_add_func("/gobex/test_decode_header_actionid",
+                                               test_decode_header_actionid);
+       g_test_add_func("/gobex/test_decode_header_multi",
+                                               test_decode_header_multi);
+
+       g_test_add_func("/gobex/test_header_encode_connid",
+                                               test_header_encode_connid);
+       g_test_add_func("/gobex/test_header_encode_name_ascii",
+                                       test_header_encode_name_ascii);
+       g_test_add_func("/gobex/test_header_encode_name_umlaut",
+                                       test_header_encode_name_umlaut);
+       g_test_add_func("/gobex/test_header_encode_body",
+                                               test_header_encode_body);
+       g_test_add_func("/gobex/test_header_encode_connid",
+                                               test_header_encode_actionid);
+
+       g_test_add_func("/gobex/test_header_name_ascii",
+                                               test_header_name_ascii);
+       g_test_add_func("/gobex/test_header_name_umlaut",
+                                               test_header_name_umlaut);
+       g_test_add_func("/gobex/test_header_bytes", test_header_bytes);
+       g_test_add_func("/gobex/test_header_uint8", test_header_uint8);
+       g_test_add_func("/gobex/test_header_uint32", test_header_uint32);
+
+       g_test_run();
+
+       return 0;
+}
diff --git a/unit/test-gobex-packet.c b/unit/test-gobex-packet.c
new file mode 100644 (file)
index 0000000..8792a59
--- /dev/null
@@ -0,0 +1,84 @@
+/*
+ *
+ *  OBEX library with GLib integration
+ *
+ *  Copyright (C) 2011  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 version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+#include <stdint.h>
+
+#include <gobex/gobex-packet.h>
+
+#include "util.h"
+
+static void test_pkt(void)
+{
+       GObexPacket *pkt;
+
+       pkt = g_obex_packet_new(G_OBEX_OP_PUT, TRUE);
+
+       g_assert(pkt != NULL);
+
+       g_obex_packet_free(pkt);
+}
+
+static void test_decode_pkt(void)
+{
+       GObexPacket *pkt;
+       uint8_t buf[] = { G_OBEX_OP_PUT, 0x00, 0x03 };
+
+       pkt = g_obex_packet_decode(buf, sizeof(buf), 0, G_OBEX_DATA_REF);
+       g_assert(pkt != NULL);
+
+       g_obex_packet_free(pkt);
+}
+
+static void test_decode_pkt_header(void)
+{
+       GObexPacket *pkt;
+       GObexHeader *header;
+       gboolean ret;
+       uint8_t buf[] = { G_OBEX_OP_PUT, 0x00, 0x05,
+                                       G_OBEX_HDR_ID_ACTION, 0xab };
+       guint8 val;
+
+       pkt = g_obex_packet_decode(buf, sizeof(buf), 0, G_OBEX_DATA_REF);
+       g_assert(pkt != NULL);
+
+       header = g_obex_packet_get_header(pkt, G_OBEX_HDR_ID_ACTION);
+       g_assert(header != NULL);
+
+       ret = g_obex_header_get_uint8(header, &val);
+       g_assert(ret == TRUE);
+       g_assert(val == 0xab);
+
+       g_obex_packet_free(pkt);
+}
+
+int main(int argc, char *argv[])
+{
+       g_test_init(&argc, &argv, NULL);
+
+       g_test_add_func("/gobex/test_pkt", test_pkt);
+       g_test_add_func("/gobex/test_decode_pkt", test_decode_pkt);
+       g_test_add_func("/gobex/test_decode_pkt_header",
+                                               test_decode_pkt_header);
+
+       g_test_run();
+
+       return 0;
+}
index 2d7734a..48addbf 100644 (file)
@@ -29,6 +29,8 @@
 
 #include <gobex/gobex.h>
 
+#include "util.h"
+
 #define FINAL_BIT 0x80
 
 static GMainLoop *mainloop = NULL;
@@ -38,70 +40,6 @@ static uint8_t pkt_connect_req[] = { G_OBEX_OP_CONNECT | FINAL_BIT,
 static uint8_t pkt_connect_rsp[] = { 0x10 | FINAL_BIT, 0x00, 0x07,
                                        0x10, 0x00, 0x10, 0x00 };
 
-static uint8_t hdr_connid[] = { G_OBEX_HDR_ID_CONNECTION, 1, 2, 3, 4 };
-static uint8_t hdr_name_ascii[] = { G_OBEX_HDR_ID_NAME, 0x00, 0x0b,
-                               0x00, 'f', 0x00, 'o', 0x00, 'o',
-                               0x00, 0x00 };
-static uint8_t hdr_name_umlaut[] = { G_OBEX_HDR_ID_NAME, 0x00, 0x0b,
-                               0x00, 0xe5, 0x00, 0xe4, 0x00, 0xf6,
-                               0x00, 0x00 };
-static uint8_t hdr_body[] = { G_OBEX_HDR_ID_BODY, 0x00, 0x07, 1, 2, 3, 4 };
-static uint8_t hdr_actionid[] = { G_OBEX_HDR_ID_ACTION, 0xab };
-
-enum {
-       TEST_ERROR_TIMEOUT,
-       TEST_ERROR_UNEXPECTED,
-};
-
-static GQuark test_error_quark(void)
-{
-       return g_quark_from_static_string("test-error-quark");
-}
-#define TEST_ERROR test_error_quark()
-
-static GObex *create_gobex(int fd, GObexTransportType transport_type,
-                                               gboolean close_on_unref)
-{
-       GIOChannel *io;
-
-       io = g_io_channel_unix_new(fd);
-       g_assert(io != NULL);
-
-       g_io_channel_set_close_on_unref(io, close_on_unref);
-
-       return g_obex_new(io, transport_type);
-}
-
-static void dump_bytes(const uint8_t *buf, size_t buf_len)
-{
-       size_t i;
-
-       for (i = 0; i < buf_len; i++)
-               g_printerr("%02x ", buf[i]);
-
-       g_printerr("\n");
-}
-
-static void dump_bufs(const void *mem1, size_t len1,
-                                               const void *mem2, size_t len2)
-{
-       g_printerr("\nExpected: ");
-       dump_bytes(mem1, len1);
-       g_printerr("Got:      ");
-       dump_bytes(mem2, len2);
-}
-
-static void assert_memequal(const void *mem1, size_t len1,
-                                               const void *mem2, size_t len2)
-{
-       if (len1 == len2 && memcmp(mem1, mem2, len1) == 0)
-               return;
-
-       dump_bufs(mem1, len1, mem2, len2);
-
-       g_assert(0);
-}
-
 static gboolean test_timeout(gpointer user_data)
 {
        GError **err = user_data;
@@ -159,6 +97,19 @@ done:
        return FALSE;
 }
 
+static GObex *create_gobex(int fd, GObexTransportType transport_type,
+                                               gboolean close_on_unref)
+{
+       GIOChannel *io;
+
+       io = g_io_channel_unix_new(fd);
+       g_assert(io != NULL);
+
+       g_io_channel_set_close_on_unref(io, close_on_unref);
+
+       return g_obex_new(io, transport_type);
+}
+
 static void create_endpoints(GObex **obex, GIOChannel **io, int sock_type)
 {
        GObexTransportType transport_type;
@@ -377,364 +328,6 @@ static void test_recv_connect_stream(void)
        g_assert_no_error(gerr);
 }
 
-static void test_header_name_ascii(void)
-{
-       GObexHeader *header;
-       uint8_t buf[1024];
-       size_t len;
-
-       header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "foo");
-
-       g_assert(header != NULL);
-
-       len = g_obex_header_encode(header, buf, sizeof(buf));
-
-       assert_memequal(hdr_name_ascii, sizeof(hdr_name_ascii), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_name_umlaut(void)
-{
-       GObexHeader *header;
-       uint8_t buf[1024];
-       size_t len;
-
-       header = g_obex_header_new_unicode(G_OBEX_HDR_ID_NAME, "åäö");
-
-       g_assert(header != NULL);
-
-       len = g_obex_header_encode(header, buf, sizeof(buf));
-
-       assert_memequal(hdr_name_umlaut, sizeof(hdr_name_umlaut), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_bytes(void)
-{
-       GObexHeader *header;
-       uint8_t buf[1024], data[] = { 1, 2, 3, 4 };
-       size_t len;
-
-       header = g_obex_header_new_bytes(G_OBEX_HDR_ID_BODY, data,
-                                               sizeof(data), G_OBEX_DATA_REF);
-       g_assert(header != NULL);
-
-       len = g_obex_header_encode(header, buf, sizeof(buf));
-
-       assert_memequal(hdr_body, sizeof(hdr_body), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_uint8(void)
-{
-       GObexHeader *header;
-       uint8_t buf[1024];
-       size_t len;
-
-       header = g_obex_header_new_uint8(G_OBEX_HDR_ID_ACTION, 0xab);
-
-       g_assert(header != NULL);
-
-       len = g_obex_header_encode(header, buf, sizeof(buf));
-
-       assert_memequal(hdr_actionid, sizeof(hdr_actionid), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_uint32(void)
-{
-       GObexHeader *header;
-       uint8_t buf[1024];
-       size_t len;
-
-       header = g_obex_header_new_uint32(G_OBEX_HDR_ID_CONNECTION,
-                                                               0x01020304);
-
-       len = g_obex_header_encode(header, buf, sizeof(buf));
-
-       assert_memequal(hdr_connid, sizeof(hdr_connid), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_pkt(void)
-{
-       GObexPacket *pkt;
-       uint8_t buf[] = { G_OBEX_OP_PUT, 0x00, 0x03 };
-
-       pkt = g_obex_packet_decode(buf, sizeof(buf), 0, G_OBEX_DATA_REF);
-       g_assert(pkt != NULL);
-
-       g_obex_packet_free(pkt);
-}
-
-static void test_decode_pkt_header(void)
-{
-       GObexPacket *pkt;
-       GObexHeader *header;
-       gboolean ret;
-       uint8_t buf[] = { G_OBEX_OP_PUT, 0x00, 0x05,
-                                       G_OBEX_HDR_ID_ACTION, 0xab };
-       guint8 val;
-
-       pkt = g_obex_packet_decode(buf, sizeof(buf), 0, G_OBEX_DATA_REF);
-       g_assert(pkt != NULL);
-
-       header = g_obex_packet_get_header(pkt, G_OBEX_HDR_ID_ACTION);
-       g_assert(header != NULL);
-
-       ret = g_obex_header_get_uint8(header, &val);
-       g_assert(ret == TRUE);
-       g_assert(val == 0xab);
-
-       g_obex_packet_free(pkt);
-}
-
-static GObexHeader *parse_and_encode(uint8_t *buf, size_t buf_len)
-{
-       GObexHeader *header;
-       uint8_t encoded[1024];
-       size_t len;
-
-       header = g_obex_header_decode(buf, buf_len, G_OBEX_DATA_REF, &len);
-       g_assert(header != NULL);
-       g_assert_cmpuint(len, ==, buf_len);
-
-       len = g_obex_header_encode(header, encoded, sizeof(encoded));
-
-       assert_memequal(buf, buf_len, encoded, len);
-
-       return header;
-}
-
-static void test_header_encode_connid(void)
-{
-       GObexHeader *header;
-       gboolean ret;
-       guint32 val;
-
-       header = parse_and_encode(hdr_connid, sizeof(hdr_connid));
-
-       ret = g_obex_header_get_uint32(header, &val);
-
-       g_assert(ret == TRUE);
-       g_assert(val == 0x01020304);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_encode_name_ascii(void)
-{
-       GObexHeader *header;
-       const char *str;
-       gboolean ret;
-
-       header = parse_and_encode(hdr_name_ascii, sizeof(hdr_name_ascii));
-
-       ret = g_obex_header_get_unicode(header, &str);
-
-       g_assert(ret == TRUE);
-       g_assert_cmpstr(str, ==, "foo");
-
-       g_obex_header_free(header);
-}
-
-static void test_header_encode_name_umlaut(void)
-{
-       GObexHeader *header;
-       const char *str;
-       gboolean ret;
-
-       header = parse_and_encode(hdr_name_umlaut, sizeof(hdr_name_umlaut));
-
-       ret = g_obex_header_get_unicode(header, &str);
-
-       g_assert(ret == TRUE);
-       g_assert_cmpstr(str, ==, "åäö");
-
-       g_obex_header_free(header);
-}
-
-static void test_header_encode_body(void)
-{
-       GObexHeader *header;
-       guint8 expected[] = { 1, 2, 3, 4};
-       const guint8 *buf;
-       size_t len;
-       gboolean ret;
-
-       header = parse_and_encode(hdr_body, sizeof(hdr_body));
-
-       ret = g_obex_header_get_bytes(header, &buf, &len);
-
-       g_assert(ret == TRUE);
-       assert_memequal(expected, sizeof(expected), buf, len);
-
-       g_obex_header_free(header);
-}
-
-static void test_header_encode_actionid(void)
-{
-       GObexHeader *header;
-       gboolean ret;
-       guint8 val;
-
-       header = parse_and_encode(hdr_actionid, sizeof(hdr_actionid));
-
-       ret = g_obex_header_get_uint8(header, &val);
-
-       g_assert(ret == TRUE);
-       g_assert_cmpuint(val, ==, 0xab);
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_connid(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_connid, sizeof(hdr_connid),
-                                               G_OBEX_DATA_REF, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_connid));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_name_ascii(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_name_ascii, sizeof(hdr_name_ascii),
-                                               G_OBEX_DATA_REF, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_ascii));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_name_umlaut(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_name_umlaut, sizeof(hdr_name_umlaut),
-                                               G_OBEX_DATA_REF, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_umlaut));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_body(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_body, sizeof(hdr_body),
-                                               G_OBEX_DATA_COPY, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_body_extdata(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_body, sizeof(hdr_body),
-                                               G_OBEX_DATA_REF, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_actionid(void)
-{
-       GObexHeader *header;
-       size_t parsed;
-
-       header = g_obex_header_decode(hdr_actionid, sizeof(hdr_actionid),
-                                               G_OBEX_DATA_REF, &parsed);
-       g_assert(header != NULL);
-
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_actionid));
-
-       g_obex_header_free(header);
-}
-
-static void test_decode_header_multi(void)
-{
-       GObexHeader *header;
-       GByteArray *buf;
-       size_t parsed;
-
-       buf = g_byte_array_sized_new(sizeof(hdr_connid) +
-                                       sizeof(hdr_name_ascii) +
-                                       sizeof(hdr_actionid) +
-                                       sizeof(hdr_body));
-
-       g_byte_array_append(buf, hdr_connid, sizeof(hdr_connid));
-       g_byte_array_append(buf, hdr_name_ascii, sizeof(hdr_name_ascii));
-       g_byte_array_append(buf, hdr_actionid, sizeof(hdr_actionid));
-       g_byte_array_append(buf, hdr_body, sizeof(hdr_body));
-
-       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
-                                                               &parsed);
-       g_assert(header != NULL);
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_connid));
-       g_byte_array_remove_range(buf, 0, parsed);
-       g_obex_header_free(header);
-
-       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
-                                                               &parsed);
-       g_assert(header != NULL);
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_name_ascii));
-       g_byte_array_remove_range(buf, 0, parsed);
-       g_obex_header_free(header);
-
-       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
-                                                               &parsed);
-       g_assert(header != NULL);
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_actionid));
-       g_byte_array_remove_range(buf, 0, parsed);
-       g_obex_header_free(header);
-
-       header = g_obex_header_decode(buf->data, buf->len, G_OBEX_DATA_REF,
-                                                               &parsed);
-       g_assert(header != NULL);
-       g_assert_cmpuint(parsed, ==, sizeof(hdr_body));
-       g_byte_array_remove_range(buf, 0, parsed);
-       g_obex_header_free(header);
-
-       g_byte_array_unref(buf);
-}
-
-static void test_pkt(void)
-{
-       GObexPacket *pkt;
-
-       pkt = g_obex_packet_new(G_OBEX_OP_PUT, TRUE);
-
-       g_assert(pkt != NULL);
-
-       g_obex_packet_free(pkt);
-}
-
 static void test_ref_unref(void)
 {
        GObex *obex;
@@ -777,46 +370,6 @@ int main(int argc, char *argv[])
        g_test_add_func("/gobex/basic", test_basic);
        g_test_add_func("/gobex/ref_unref", test_ref_unref);
 
-       g_test_add_func("/gobex/test_pkt", test_pkt);
-
-       g_test_add_func("/gobex/test_decode_header_connid",
-                                               test_decode_header_connid);
-       g_test_add_func("/gobex/test_decode_header_name_ascii",
-                                       test_decode_header_name_ascii);
-       g_test_add_func("/gobex/test_decode_header_name_umlaut",
-                                       test_decode_header_name_umlaut);
-       g_test_add_func("/gobex/test_decode_header_body",
-                                               test_decode_header_body);
-       g_test_add_func("/gobex/test_decode_header_body_extdata",
-                                       test_decode_header_body_extdata);
-       g_test_add_func("/gobex/test_decode_header_actionid",
-                                               test_decode_header_actionid);
-       g_test_add_func("/gobex/test_decode_header_multi",
-                                               test_decode_header_multi);
-
-       g_test_add_func("/gobex/test_header_encode_connid",
-                                               test_header_encode_connid);
-       g_test_add_func("/gobex/test_header_encode_name_ascii",
-                                       test_header_encode_name_ascii);
-       g_test_add_func("/gobex/test_header_encode_name_umlaut",
-                                       test_header_encode_name_umlaut);
-       g_test_add_func("/gobex/test_header_encode_body",
-                                               test_header_encode_body);
-       g_test_add_func("/gobex/test_header_encode_connid",
-                                               test_header_encode_actionid);
-
-       g_test_add_func("/gobex/test_header_name_ascii",
-                                               test_header_name_ascii);
-       g_test_add_func("/gobex/test_header_name_umlaut",
-                                               test_header_name_umlaut);
-       g_test_add_func("/gobex/test_header_bytes", test_header_bytes);
-       g_test_add_func("/gobex/test_header_uint8", test_header_uint8);
-       g_test_add_func("/gobex/test_header_uint32", test_header_uint32);
-
-       g_test_add_func("/gobex/test_decode_pkt", test_decode_pkt);
-       g_test_add_func("/gobex/test_decode_pkt_header",
-                                               test_decode_pkt_header);
-
        g_test_add_func("/gobex/test_recv_connect_stream",
                                                test_recv_connect_stream);
        g_test_add_func("/gobex/test_send_connect_stream",
diff --git a/unit/util.c b/unit/util.c
new file mode 100644 (file)
index 0000000..7045e4f
--- /dev/null
@@ -0,0 +1,61 @@
+/*
+ *
+ *  OBEX library with GLib integration
+ *
+ *  Copyright (C) 2011  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 version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+#include <stdint.h>
+#include <string.h>
+
+#include <glib.h>
+
+#include "util.h"
+
+GQuark test_error_quark(void)
+{
+       return g_quark_from_static_string("test-error-quark");
+}
+
+static void dump_bytes(const uint8_t *buf, size_t buf_len)
+{
+       size_t i;
+
+       for (i = 0; i < buf_len; i++)
+               g_printerr("%02x ", buf[i]);
+
+       g_printerr("\n");
+}
+
+void dump_bufs(const void *mem1, size_t len1, const void *mem2, size_t len2)
+{
+       g_printerr("\nExpected: ");
+       dump_bytes(mem1, len1);
+       g_printerr("Got:      ");
+       dump_bytes(mem2, len2);
+}
+
+void assert_memequal(const void *mem1, size_t len1,
+                                               const void *mem2, size_t len2)
+{
+       if (len1 == len2 && memcmp(mem1, mem2, len1) == 0)
+               return;
+
+       dump_bufs(mem1, len1, mem2, len2);
+
+       g_assert(0);
+}
diff --git a/unit/util.h b/unit/util.h
new file mode 100644 (file)
index 0000000..cf41494
--- /dev/null
@@ -0,0 +1,32 @@
+/*
+ *
+ *  OBEX library with GLib integration
+ *
+ *  Copyright (C) 2011  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 version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  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
+ *
+ */
+
+enum {
+       TEST_ERROR_TIMEOUT,
+       TEST_ERROR_UNEXPECTED,
+};
+
+#define TEST_ERROR test_error_quark()
+GQuark test_error_quark(void);
+
+void dump_bufs(const void *mem1, size_t len1, const void *mem2, size_t len2);
+void assert_memequal(const void *mem1, size_t len1,
+                                               const void *mem2, size_t len2);