tests,sms: refactor SMS part related tests

Now using the MMSmsPart setup.

5 files changed, 657 insertions, 699 deletions

diff --git a/.gitignore b/.gitignore
index 373fe75b..5158dbb7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,7 +41,7 @@ src/tests/test-modem-helpers
 src/tests/test-charsets
 src/tests/test-qcdm-serial-port
 src/tests/test-at-serial-port
-src/tests/test-sms
+src/tests/test-sms-part
 
 policy/org.freedesktop.modem-manager.policy
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 81a414af..b12e645a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -32,8 +32,8 @@ libmodem_helpers_la_SOURCES = \
 	mm-charsets.h \
 	mm-utils.c \
 	mm-utils.h \
-	mm-sms-utils.c \
-	mm-sms-utils.h
+	mm-sms-part.h \
+	mm-sms-part.c
 
 # libserial specific enum types
 SERIAL_ENUMS = \
diff --git a/src/tests/Makefile.am b/src/tests/Makefile.am
index 2bcfeb0b..36f3d969 100644
--- a/src/tests/Makefile.am
+++ b/src/tests/Makefile.am
@@ -4,7 +4,7 @@ noinst_PROGRAMS = \
 	test-charsets \
 	test-qcdm-serial-port \
 	test-at-serial-port \
-	test-sms
+	test-sms-part
 
 test_modem_helpers_SOURCES = \
 	test-modem-helpers.c
@@ -71,10 +71,10 @@ test_at_serial_port_LDADD = \
 	$(top_builddir)/src/libmodem-helpers.la \
 	-lutil
 
-test_sms_SOURCES = \
-	test-sms.c
+test_sms_part_SOURCES = \
+	test-sms-part.c
 
-test_sms_CPPFLAGS = \
+test_sms_part_CPPFLAGS = \
 	$(MM_CFLAGS) \
 	-I$(top_srcdir) \
 	-I$(top_srcdir)/src \
@@ -83,7 +83,7 @@ test_sms_CPPFLAGS = \
 	-I$(top_srcdir)/libmm-common \
 	-I$(top_builddir)/libmm-common
 
-test_sms_LDADD = \
+test_sms_part_LDADD = \
 	$(top_builddir)/src/libmodem-helpers.la \
 	$(MM_LIBS)
 
@@ -93,6 +93,6 @@ check-local: test-modem-helpers
 	$(abs_builddir)/test-modem-helpers
 	$(abs_builddir)/test-charsets
 	$(abs_builddir)/test-qcdm-serial-port
-	$(abs_builddir)/test-sms
+	$(abs_builddir)/test-sms-part
 
 endif
diff --git a/src/tests/test-sms-part.c b/src/tests/test-sms-part.c
new file mode 100644
index 00000000..9a85595c
--- /dev/null
+++ b/src/tests/test-sms-part.c
@@ -0,0 +1,648 @@
+/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * 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:
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ * Copyright (C) 2011 The Chromium OS Authors.
+ */
+
+#include <glib.h>
+#include <glib-object.h>
+#include <string.h>
+
+#include "mm-sms-part.h"
+#include "mm-utils.h"
+
+/********************* PDU PARSER TESTS *********************/
+
+static void
+common_test_part_from_hexpdu (const gchar *hexpdu,
+                              const gchar *expected_smsc,
+                              const gchar *expected_number,
+                              const gchar *expected_timestamp,
+                              const gchar *expected_text,
+                              const guint8 *expected_data,
+                              gsize expected_data_size,
+                              guint expected_data_coding_scheme)
+{
+    MMSmsPart *part;
+    GError *error = NULL;
+
+    part = mm_sms_part_new_from_pdu (0, hexpdu, &error);
+    g_assert_no_error (error);
+    g_assert (part != NULL);
+
+    if (expected_smsc)
+        g_assert_cmpstr (expected_smsc, ==, mm_sms_part_get_smsc (part));
+    if (expected_number)
+        g_assert_cmpstr (expected_number, ==, mm_sms_part_get_number (part));
+    if (expected_timestamp)
+        g_assert_cmpstr (expected_timestamp, ==, mm_sms_part_get_timestamp (part));
+    if (expected_text)
+        g_assert_cmpstr (expected_text, ==, mm_sms_part_get_text (part));
+
+    if (expected_data) {
+        guint32 i;
+        const GByteArray *data;
+
+        data = mm_sms_part_get_data (part);
+        g_assert_cmpuint (expected_data_coding_scheme, ==, mm_sms_part_get_data_coding_scheme (part));
+        g_assert_cmpuint ((guint)expected_data_size, ==, data->len);
+        for (i = 0; i < data->len; i++)
+            g_assert_cmpuint ((guint)data->data[i], ==, expected_data[i]);
+    }
+
+
+    mm_sms_part_free (part);
+}
+
+static void
+common_test_part_from_pdu (const guint8 *pdu,
+                           gsize pdu_size,
+                           const gchar *expected_smsc,
+                           const gchar *expected_number,
+                           const gchar *expected_timestamp,
+                           const gchar *expected_text,
+                           const guint8 *expected_data,
+                           gsize expected_data_size,
+                           guint expected_data_coding_scheme)
+{
+    gchar *hexpdu;
+
+    hexpdu = utils_bin2hexstr (pdu, pdu_size);
+    common_test_part_from_hexpdu (hexpdu,
+                                  expected_smsc,
+                                  expected_number,
+                                  expected_timestamp,
+                                  expected_text,
+                                  expected_data,
+                                  expected_data_size,
+                                  expected_data_coding_scheme);
+    g_free (hexpdu);
+}
+
+static void
+test_pdu1 (void)
+{
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x04, 0x44, 0x29, 0x61, 0xf4,
+        0x04, 0x0b, 0x91, 0x61, 0x71, 0x95, 0x72, 0x91,
+        0xf8, 0x00, 0x00, 0x11, 0x20, 0x82, 0x11, 0x05,
+        0x05, 0x0a,
+        // user data:
+        0x6a, 0xc8, 0xb2, 0xbc, 0x7c, 0x9a, 0x83, 0xc2,
+        0x20, 0xf6, 0xdb, 0x7d, 0x2e, 0xcb, 0x41, 0xed,
+        0xf2, 0x7c, 0x1e, 0x3e, 0x97, 0x41, 0x1b, 0xde,
+        0x06, 0x75, 0x4f, 0xd3, 0xd1, 0xa0, 0xf9, 0xbb,
+        0x5d, 0x06, 0x95, 0xf1, 0xf4, 0xb2, 0x9b, 0x5c,
+        0x26, 0x83, 0xc6, 0xe8, 0xb0, 0x3c, 0x3c, 0xa6,
+        0x97, 0xe5, 0xf3, 0x4d, 0x6a, 0xe3, 0x03, 0xd1,
+        0xd1, 0xf2, 0xf7, 0xdd, 0x0d, 0x4a, 0xbb, 0x59,
+        0xa0, 0x79, 0x7d, 0x8c, 0x06, 0x85, 0xe7, 0xa0,
+        0x00, 0x28, 0xec, 0x26, 0x83, 0x2a, 0x96, 0x0b,
+        0x28, 0xec, 0x26, 0x83, 0xbe, 0x60, 0x50, 0x78,
+        0x0e, 0xba, 0x97, 0xd9, 0x6c, 0x17 };
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12404492164", /* smsc */
+        "+16175927198", /* number */
+        "110228115050-05", /* timestamp */
+        "Here's a longer message [{with some extended characters}] "
+        "thrown in, such as £ and ΩΠΨ and §¿ as well.", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu2 (void)
+{
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x97, 0x30, 0x07, 0x11, 0x11, 0xf1,
+        0x04, 0x14, 0xd0, 0x49, 0x37, 0xbd, 0x2c, 0x77,
+        0x97, 0xe9, 0xd3, 0xe6, 0x14, 0x00, 0x08, 0x11,
+        0x30, 0x92, 0x91, 0x02, 0x40, 0x61, 0x08, 0x04,
+        0x42, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+79037011111", /* smsc */
+        "InternetSMS", /* number */
+        "110329192004+04", /* timestamp */
+        "тест", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu3 (void)
+{
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "+18005551212", /* number */
+        "110101123456+00", /* timestamp */
+        "hellohello", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu3_nzpid (void)
+{
+    /* pid is nonzero (00 -> ff) */
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0xff, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "+18005551212", /* number */
+        "110101123456+00", /* timestamp */
+        "hellohello", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu3_mms (void)
+{
+    /* mms is clear (04 -> 00) */
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x00, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "+18005551212", /* number */
+        "110101123456+00", /* timestamp */
+        "hellohello", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu3_natl (void)
+{
+    /* number is natl (91 -> 81) */
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x81, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "18005551212", /* number, no plus */
+        "110101123456+00", /* timestamp */
+        "hellohello", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu3_8bit (void)
+{
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0x04, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37, 0xde};
+    static const guint8 expected_data[] = {
+        0xe8, 0x32, 0x9b, 0xfd, 0x46, 0x97, 0xd9, 0xec, 0x37, 0xde };
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "+18005551212", /* number */
+        "110101123456+00", /* timestamp */
+        "", /* text */
+        expected_data, /* data */
+        sizeof (expected_data), /* data size */
+        0x04); /* data coding scheme */
+}
+
+static void
+test_pdu_dcsf1 (void)
+{
+    /* TP-DCS coding scheme is group F */
+    static const guint8 pdu[] = {
+        0x07,       // length of SMSC info
+        0x91,       // type of address of SMSC (E.164)
+        0x33, 0x06, 0x09, 0x10, 0x93, 0xF0,  // SMSC address (+33 60 90 01 39 0)
+        0x04,       // SMS-DELIVER
+        0x04,       // address length
+        0x85,       // type of address
+        0x81, 0x00, // sender address (1800)
+        0x00,       // TP-PID protocol identifier
+        0xF1,       // TP-DCS data coding scheme
+        0x11, 0x60, 0x42, 0x31, 0x80, 0x51, 0x80,   // timestamp 11-06-24 13:08:51
+        0xA0,       // TP-UDL user data length (160)
+        // Content:
+        0x49,
+        0xB7, 0xF9, 0x0D, 0x9A, 0x1A, 0xA5, 0xA0, 0x16,
+        0x68, 0xF8, 0x76, 0x9B, 0xD3, 0xE4, 0xB2, 0x9B,
+        0x9E, 0x2E, 0xB3, 0x59, 0xA0, 0x3F, 0xC8, 0x5D,
+        0x06, 0xA9, 0xC3, 0xED, 0x70, 0x7A, 0x0E, 0xA2,
+        0xCB, 0xC3, 0xEE, 0x79, 0xBB, 0x4C, 0xA7, 0xCB,
+        0xCB, 0xA0, 0x56, 0x43, 0x61, 0x7D, 0xA7, 0xC7,
+        0x69, 0x90, 0xFD, 0x4D, 0x97, 0x97, 0x41, 0xEE,
+        0x77, 0xDD, 0x5E, 0x0E, 0xD7, 0x41, 0xED, 0x37,
+        0x1D, 0x44, 0x2E, 0x83, 0xE0, 0xE1, 0xF9, 0xBC,
+        0x0C, 0xD2, 0x81, 0xE6, 0x77, 0xD9, 0xB8, 0x4C,
+        0x06, 0xC1, 0xDF, 0x75, 0x39, 0xE8, 0x5C, 0x90,
+        0x97, 0xE5, 0x20, 0xFB, 0x9B, 0x2E, 0x2F, 0x83,
+        0xC6, 0xEF, 0x36, 0x9C, 0x5E, 0x06, 0x4D, 0x8D,
+        0x52, 0xD0, 0xBC, 0x2E, 0x07, 0xDD, 0xEF, 0x77,
+        0xD7, 0xDC, 0x2C, 0x77, 0x99, 0xE5, 0xA0, 0x77,
+        0x1D, 0x04, 0x0F, 0xCB, 0x41, 0xF4, 0x02, 0xBB,
+        0x00, 0x47, 0xBF, 0xDD, 0x65, 0x50, 0xB8, 0x0E,
+        0xCA, 0xD9, 0x66};
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+33609001390", /* smsc */
+        "1800", /* number */
+        "110624130815+02", /* timestamp */
+        "Info SFR - Confidentiel, à ne jamais transmettre -\r\n"
+        "Voici votre nouveau mot de passe : sw2ced pour gérer "
+        "votre compte SFR sur www.sfr.fr ou par téléphone au 963", /* text */
+        NULL, 0, 0);
+}
+
+static void
+test_pdu_dcsf_8bit (void)
+{
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0xf4, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37, 0xde};
+    static const guint8 expected_data[] = {
+        0xe8, 0x32, 0x9b, 0xfd, 0x46, 0x97, 0xd9, 0xec, 0x37, 0xde };
+
+    common_test_part_from_pdu (
+        pdu, sizeof (pdu),
+        "+12345678901", /* smsc */
+        "+18005551212", /* number */
+        "110101123456+00", /* timestamp */
+        "", /* text */
+        expected_data, /* data */
+        sizeof (expected_data), /* data size */
+        0xF4); /* data coding scheme */
+}
+
+static void
+test_pdu_insufficient_data (void)
+{
+    GError *error = NULL;
+    MMSmsPart *part;
+    gchar *hexpdu;
+    static const guint8 pdu[] = {
+        0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
+        0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
+        0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
+        0x65, 0x00, 0x0b, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
+        0x97, 0xd9, 0xec, 0x37
+    };
+
+    hexpdu = utils_bin2hexstr (pdu, sizeof (pdu));
+    part = mm_sms_part_new_from_pdu (0, hexpdu, &error);
+    g_assert (part == NULL);
+    /* We don't care for the specific error type */
+    g_assert (error != NULL);
+    g_free (hexpdu);
+}
+
+
+static void
+test_pdu_udhi (void)
+{
+    /* Welcome message from KPN NL */
+    static const gchar *hexpdu =
+        "07911356131313F64004850120390011609232239180A006080400100201D7327BFD6EB340E232"
+        "1BF46E83EA7790F59D1E97DBE1341B442F83C465763D3DA797E56537C81D0ECB41AB59CC1693C1"
+        "6031D96C064241E5656838AF03A96230982A269BCD462917C8FA4E8FCBED709A0D7ABBE9F6B0FB"
+        "5C7683D27350984D4FABC9A0B33C4C4FCF5D20EBFB2D079DCB62793DBD06D9C36E50FB2D4E97D9"
+        "A0B49B5E96BBCB";
+
+    common_test_part_from_hexpdu (
+        hexpdu,
+        "+31653131316", /* smsc */
+        "1002", /* number */
+        "110629233219+02", /* timestamp */
+        "Welkom, bel om uw Voicemail te beluisteren naar +31612001233"
+        " (PrePay: *100*1233#). Voicemail ontvangen is altijd gratis."
+        " Voor gebruik van mobiel interne", /* text */
+        NULL, 0, 0);
+}
+
+/********************* SMS ADDRESS ENCODER TESTS *********************/
+
+static void
+common_test_address_encode (const gchar *address,
+                            gboolean smsc,
+                            const guint8 *expected,
+                            gsize expected_size)
+{
+    guint8 buf[20];
+    gsize enclen;
+
+    enclen = mm_sms_part_encode_address (address, buf, sizeof (buf), smsc);
+    g_assert_cmpuint (enclen, ==, expected_size);
+    g_assert_cmpint (memcmp (buf, expected, expected_size), ==, 0);
+}
+
+static void
+test_address_encode_smsc_intl (void)
+{
+    static const gchar *addr = "+19037029920";
+    static const guint8 expected[] = { 0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0 };
+
+    common_test_address_encode (addr, TRUE, expected, sizeof (expected));
+}
+
+static void
+test_address_encode_smsc_unknown (void)
+{
+    static const char *addr = "9037029920";
+    static const guint8 expected[] = { 0x06, 0x81, 0x09, 0x73, 0x20, 0x99, 0x02 };
+
+    common_test_address_encode (addr, TRUE, expected, sizeof (expected));
+}
+
+static void
+test_address_encode_intl (void)
+{
+    static const char *addr = "+19037029920";
+    static const guint8 expected[] = { 0x0B, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0 };
+
+    common_test_address_encode (addr, FALSE, expected, sizeof (expected));
+}
+
+static void
+test_address_encode_unknown (void)
+{
+    static const char *addr = "9037029920";
+    static const guint8 expected[] = { 0x0A, 0x81, 0x09, 0x73, 0x20, 0x99, 0x02 };
+
+    common_test_address_encode (addr, FALSE, expected, sizeof (expected));
+}
+
+/********************* PDU CREATOR TESTS *********************/
+
+static void
+common_test_create_pdu (const gchar *smsc,
+                        const gchar *number,
+                        const gchar *text,
+                        guint validity,
+                        guint class,
+                        const guint8 *expected,
+                        gsize expected_size,
+                        guint expected_msgstart)
+{
+    MMSmsPart *part;
+    guint8 *pdu;
+    guint len = 0, msgstart = 0;
+    GError *error = NULL;
+
+    part = mm_sms_part_new (0);
+    if (smsc)
+        mm_sms_part_set_smsc (part, smsc);
+    if (number)
+        mm_sms_part_set_number (part, number);
+    if (text)
+        mm_sms_part_set_text (part, text);
+    if (validity > 0)
+        mm_sms_part_set_validity (part, validity);
+    if (class > 0)
+        mm_sms_part_set_class (part, class);
+
+    pdu = mm_sms_part_get_submit_pdu (part,
+                                      &len,
+                                      &msgstart,
+                                      &error);
+
+    g_assert_no_error (error);
+    g_assert (pdu != NULL);
+    g_assert_cmpuint (len, ==, expected_size);
+    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
+    g_assert_cmpint (msgstart, ==, expected_msgstart);
+
+    g_free (pdu);
+}
+
+static void
+test_create_pdu_ucs2_with_smsc (void)
+{
+    static const char *smsc = "+19037029920";
+    static const char *number = "+15555551234";
+    static const char *text = "Да здравствует король, детка!";
+    static const guint8 expected[] = {
+        0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0, 0x11, 0x00, 0x0B, 0x91,
+        0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00, 0x08, 0x00, 0x3A, 0x04, 0x14,
+        0x04, 0x30, 0x00, 0x20, 0x04, 0x37, 0x04, 0x34, 0x04, 0x40, 0x04, 0x30,
+        0x04, 0x32, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x43, 0x04, 0x35,
+        0x04, 0x42, 0x00, 0x20, 0x04, 0x3A, 0x04, 0x3E, 0x04, 0x40, 0x04, 0x3E,
+        0x04, 0x3B, 0x04, 0x4C, 0x00, 0x2C, 0x00, 0x20, 0x04, 0x34, 0x04, 0x35,
+        0x04, 0x42, 0x04, 0x3A, 0x04, 0x30, 0x00, 0x21
+    };
+
+    common_test_create_pdu (smsc,
+                            number,
+                            text,
+                            5, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            8); /* expected_msgstart */
+}
+
+static void
+test_create_pdu_ucs2_no_smsc (void)
+{
+    static const char *number = "+15555551234";
+    static const char *text = "Да здравствует король, детка!";
+    static const guint8 expected[] = {
+        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00,
+        0x08, 0x00, 0x3A, 0x04, 0x14, 0x04, 0x30, 0x00, 0x20, 0x04, 0x37, 0x04,
+        0x34, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, 0x04, 0x41, 0x04, 0x42, 0x04,
+        0x32, 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3A, 0x04,
+        0x3E, 0x04, 0x40, 0x04, 0x3E, 0x04, 0x3B, 0x04, 0x4C, 0x00, 0x2C, 0x00,
+        0x20, 0x04, 0x34, 0x04, 0x35, 0x04, 0x42, 0x04, 0x3A, 0x04, 0x30, 0x00,
+        0x21
+    };
+
+    common_test_create_pdu (NULL, /* smsc */
+                            number,
+                            text,
+                            5, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            1); /* expected_msgstart */
+}
+
+static void
+test_create_pdu_gsm_with_smsc (void)
+{
+    static const char *smsc = "+19037029920";
+    static const char *number = "+15555551234";
+    static const char *text = "Hi there...Tue 17th Jan 2012 05:30.18 pm (GMT+1) ΔΔΔΔΔ";
+    static const guint8 expected[] = {
+        0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0, 0x11, 0x00, 0x0B, 0x91,
+        0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00, 0x00, 0x00, 0x36, 0xC8, 0x34,
+        0x88, 0x8E, 0x2E, 0xCB, 0xCB, 0x2E, 0x97, 0x8B, 0x5A, 0x2F, 0x83, 0x62,
+        0x37, 0x3A, 0x1A, 0xA4, 0x0C, 0xBB, 0x41, 0x32, 0x58, 0x4C, 0x06, 0x82,
+        0xD5, 0x74, 0x33, 0x98, 0x2B, 0x86, 0x03, 0xC1, 0xDB, 0x20, 0xD4, 0xB1,
+        0x49, 0x5D, 0xC5, 0x52, 0x20, 0x08, 0x04, 0x02, 0x81, 0x00
+    };
+
+    common_test_create_pdu (smsc,
+                            number,
+                            text,
+                            5, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            8); /* expected_msgstart */
+}
+
+static void
+test_create_pdu_gsm_no_smsc (void)
+{
+    static const char *number = "+15555551234";
+    static const char *text = "Hi there...Tue 17th Jan 2012 05:30.18 pm (GMT+1) ΔΔΔΔΔ";
+    static const guint8 expected[] = {
+        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00,
+        0x00, 0x00, 0x36, 0xC8, 0x34, 0x88, 0x8E, 0x2E, 0xCB, 0xCB, 0x2E, 0x97,
+        0x8B, 0x5A, 0x2F, 0x83, 0x62, 0x37, 0x3A, 0x1A, 0xA4, 0x0C, 0xBB, 0x41,
+        0x32, 0x58, 0x4C, 0x06, 0x82, 0xD5, 0x74, 0x33, 0x98, 0x2B, 0x86, 0x03,
+        0xC1, 0xDB, 0x20, 0xD4, 0xB1, 0x49, 0x5D, 0xC5, 0x52, 0x20, 0x08, 0x04,
+        0x02, 0x81, 0x00
+    };
+
+    common_test_create_pdu (NULL, /* smsc */
+                            number,
+                            text,
+                            5, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            1); /* expected_msgstart */
+}
+
+static void
+test_create_pdu_gsm_3 (void)
+{
+    static const char *number = "+15556661234";
+    static const char *text = "This is really cool ΔΔΔΔΔ";
+    static const guint8 expected[] = {
+        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x66, 0x16, 0x32, 0xF4, 0x00,
+        0x00, 0x00, 0x19, 0x54, 0x74, 0x7A, 0x0E, 0x4A, 0xCF, 0x41, 0xF2, 0x72,
+        0x98, 0xCD, 0xCE, 0x83, 0xC6, 0xEF, 0x37, 0x1B, 0x04, 0x81, 0x40, 0x20,
+        0x10
+    };
+
+    /* Tests that a 25-character message (where the last septet is packed into
+     * an octet by itself) is created correctly.  Previous to
+     * "core: fix some bugs in GSM7 packing code" the GSM packing code would
+     * leave off the last octet.
+     */
+
+    common_test_create_pdu (NULL, /* smsc */
+                            number,
+                            text,
+                            5, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            1); /* expected_msgstart */
+}
+
+static void
+test_create_pdu_gsm_no_validity (void)
+{
+    static const char *number = "+15556661234";
+    static const char *text = "This is really cool ΔΔΔΔΔ";
+    static const guint8 expected[] = {
+        0x00, 0x01, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x66, 0x16, 0x32, 0xF4, 0x00,
+        0x00, 0x19, 0x54, 0x74, 0x7A, 0x0E, 0x4A, 0xCF, 0x41, 0xF2, 0x72, 0x98,
+        0xCD, 0xCE, 0x83, 0xC6, 0xEF, 0x37, 0x1B, 0x04, 0x81, 0x40, 0x20, 0x10
+    };
+
+    common_test_create_pdu (NULL, /* smsc */
+                            number,
+                            text,
+                            0, /* validity */
+                            0, /* class */
+                            expected,
+                            sizeof (expected),
+                            1); /* expected_msgstart */
+}
+
+#if 0
+{
+int i;
+g_print ("\n        ");
+for (i = 0; i < len; i++) {
+   g_print ("  0x%02X", pdu[i]);
+   if (((i + 1) % 12) == 0)
+      g_print ("\n        ");
+}
+g_print ("\n");
+}
+#endif
+
+int main (int argc, char **argv)
+{
+    g_type_init ();
+    g_test_init (&argc, &argv, NULL);
+
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu1", test_pdu1);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu2", test_pdu2);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu3", test_pdu3);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu3-nonzero-pid", test_pdu3_nzpid);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu3-mms", test_pdu3_mms);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu3-natl", test_pdu3_natl);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu3-8bit", test_pdu3_8bit);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu-dcsf1", test_pdu_dcsf1);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu-dcsf-8bit", test_pdu_dcsf_8bit);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu-insufficient-data", test_pdu_insufficient_data);
+    g_test_add_func ("/MM/SMS/PDU-Parser/pdu-udhi", test_pdu_udhi);
+
+    g_test_add_func ("/MM/SMS/Address-Encoder/smsc-intl", test_address_encode_smsc_intl);
+    g_test_add_func ("/MM/SMS/Address-Encoder/smsc-unknown", test_address_encode_smsc_unknown);
+    g_test_add_func ("/MM/SMS/Address-Encoder/intl", test_address_encode_intl);
+    g_test_add_func ("/MM/SMS/Address-Encoder/unknown", test_address_encode_unknown);
+
+    g_test_add_func ("/MM/SMS/PDU-Creator/UCS2-with-smsc", test_create_pdu_ucs2_with_smsc);
+    g_test_add_func ("/MM/SMS/PDU-Creator/UCS2-no-smsc", test_create_pdu_ucs2_no_smsc);
+    g_test_add_func ("/MM/SMS/PDU-Creator/GSM-with-smsc", test_create_pdu_gsm_with_smsc);
+    g_test_add_func ("/MM/SMS/PDU-Creator/GSM-no-smsc", test_create_pdu_gsm_no_smsc);
+    g_test_add_func ("/MM/SMS/PDU-Creator/GSM-3", test_create_pdu_gsm_3);
+    g_test_add_func ("/MM/SMS/PDU-Creator/GSM-no-validity", test_create_pdu_gsm_no_validity);
+
+    return g_test_run ();
+}
diff --git a/src/tests/test-sms.c b/src/tests/test-sms.c
deleted file mode 100644
index 5c32ad1e..00000000
--- a/src/tests/test-sms.c
+++ /dev/null
@@ -1,690 +0,0 @@
-/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * 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:
- *
- * Copyright (C) 2010 Red Hat, Inc.
- * Copyright (C) 2011 The Chromium OS Authors.
- */
-
-#include <glib.h>
-#include <glib-object.h>
-#include <string.h>
-
-#include "mm-sms-utils.h"
-#include "mm-utils.h"
-#include "dbus/dbus-glib.h"
-
-
-#define TEST_ENTRY_EQ(hash, key, expectvalue) do { \
-  GValue *value;                          \
-  value = g_hash_table_lookup((hash), (key)); \
-  g_assert(value); \
-  g_assert(G_VALUE_HOLDS_STRING(value)); \
-  g_assert_cmpstr(g_value_get_string(value), ==, (expectvalue)); \
-  } while (0)
-
-#define TEST_UINT_ENTRY_EQ(hash, key, expectvalue) do { \
-  GValue *value;                          \
-  value = g_hash_table_lookup((hash), (key)); \
-  g_assert(value); \
-  g_assert(G_VALUE_HOLDS_UINT(value)); \
-  g_assert_cmpint(g_value_get_uint(value), ==, (expectvalue)); \
-  } while (0)
-
-#define TEST_ARRAY_ENTRY_EQ(hash, key, expectvalue) do { \
-  GValue *value; \
-  GByteArray *tmp; \
-  guint32 i; \
-  value = g_hash_table_lookup((hash), (key)); \
-  g_assert(value); \
-  g_assert(G_VALUE_HOLDS(value, DBUS_TYPE_G_UCHAR_ARRAY)); \
-  tmp = g_value_get_boxed (value); \
-  g_assert_cmpint (tmp->len, ==, sizeof (expectvalue)); \
-  for (i = 0; i < tmp->len; i++) \
-    g_assert_cmpint (tmp->data[i], ==, expectvalue[i]); \
-  } while (0)
-
-static void
-test_pdu1 (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x04, 0x44, 0x29, 0x61, 0xf4,
-    0x04, 0x0b, 0x91, 0x61, 0x71, 0x95, 0x72, 0x91,
-    0xf8, 0x00, 0x00, 0x11, 0x20, 0x82, 0x11, 0x05,
-    0x05, 0x0a,
-    // user data:
-    0x6a, 0xc8, 0xb2, 0xbc, 0x7c, 0x9a, 0x83, 0xc2,
-    0x20, 0xf6, 0xdb, 0x7d, 0x2e, 0xcb, 0x41, 0xed,
-    0xf2, 0x7c, 0x1e, 0x3e, 0x97, 0x41, 0x1b, 0xde,
-    0x06, 0x75, 0x4f, 0xd3, 0xd1, 0xa0, 0xf9, 0xbb,
-    0x5d, 0x06, 0x95, 0xf1, 0xf4, 0xb2, 0x9b, 0x5c,
-    0x26, 0x83, 0xc6, 0xe8, 0xb0, 0x3c, 0x3c, 0xa6,
-    0x97, 0xe5, 0xf3, 0x4d, 0x6a, 0xe3, 0x03, 0xd1,
-    0xd1, 0xf2, 0xf7, 0xdd, 0x0d, 0x4a, 0xbb, 0x59,
-    0xa0, 0x79, 0x7d, 0x8c, 0x06, 0x85, 0xe7, 0xa0,
-    0x00, 0x28, 0xec, 0x26, 0x83, 0x2a, 0x96, 0x0b,
-    0x28, 0xec, 0x26, 0x83, 0xbe, 0x60, 0x50, 0x78,
-    0x0e, 0xba, 0x97, 0xd9, 0x6c, 0x17};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12404492164");
-  TEST_ENTRY_EQ (sms, "number", "+16175927198");
-  TEST_ENTRY_EQ (sms, "timestamp", "110228115050-05");
-  TEST_ENTRY_EQ (sms, "text",
-                "Here's a longer message [{with some extended characters}] "
-                "thrown in, such as £ and ΩΠΨ and §¿ as well.");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-static void
-test_pdu2 (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x97, 0x30, 0x07, 0x11, 0x11, 0xf1,
-    0x04, 0x14, 0xd0, 0x49, 0x37, 0xbd, 0x2c, 0x77,
-    0x97, 0xe9, 0xd3, 0xe6, 0x14, 0x00, 0x08, 0x11,
-    0x30, 0x92, 0x91, 0x02, 0x40, 0x61, 0x08, 0x04,
-    0x42, 0x04, 0x35, 0x04, 0x41, 0x04, 0x42};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+79037011111");
-  TEST_ENTRY_EQ (sms, "number", "InternetSMS");
-  TEST_ENTRY_EQ (sms, "timestamp", "110329192004+04");
-  TEST_ENTRY_EQ (sms, "text", "тест");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-static void
-test_pdu3 (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "+18005551212");
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "hellohello");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-static void
-test_pdu3_nzpid (void *f, gpointer d)
-{
-  /* pid is nonzero (00 -> ff) */
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0xff, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "+18005551212");
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "hellohello");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-
-static void
-test_pdu3_mms (void *f, gpointer d)
-{
-  /* mms is clear (04 -> 00) */
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x00, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "+18005551212");
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "hellohello");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-static void
-test_pdu3_natl (void *f, gpointer d)
-{
-  /* number is natl (91 -> 81) */
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x81, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "18005551212"); /* no plus */
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "hellohello");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-static void
-test_pdu3_8bit (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0x04, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37, 0xde};
-  static const guint8 expected_data[] = {
-    0xe8, 0x32, 0x9b, 0xfd, 0x46, 0x97, 0xd9, 0xec, 0x37, 0xde };
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "+18005551212");
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "");
-  TEST_UINT_ENTRY_EQ (sms, "data-coding-scheme", 0x04);
-  TEST_ARRAY_ENTRY_EQ (sms, "data", expected_data);
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-static void
-test_pdu_dcsf1 (void *f, gpointer d)
-{
-  /* TP-DCS coding scheme is group F */
-  static const guint8 pdu[] = {
-    0x07,       // length of SMSC info
-    0x91,       // type of address of SMSC (E.164)
-    0x33, 0x06, 0x09, 0x10, 0x93, 0xF0,  // SMSC address (+33 60 90 01 39 0)
-    0x04,       // SMS-DELIVER
-    0x04,       // address length
-    0x85,       // type of address
-    0x81, 0x00, // sender address (1800)
-    0x00,       // TP-PID protocol identifier
-    0xF1,       // TP-DCS data coding scheme
-    0x11, 0x60, 0x42, 0x31, 0x80, 0x51, 0x80,   // timestamp 11-06-24 13:08:51
-    0xA0,       // TP-UDL user data length (160)
-    // Content:
-    0x49,
-    0xB7, 0xF9, 0x0D, 0x9A, 0x1A, 0xA5, 0xA0, 0x16,
-    0x68, 0xF8, 0x76, 0x9B, 0xD3, 0xE4, 0xB2, 0x9B,
-    0x9E, 0x2E, 0xB3, 0x59, 0xA0, 0x3F, 0xC8, 0x5D,
-    0x06, 0xA9, 0xC3, 0xED, 0x70, 0x7A, 0x0E, 0xA2,
-    0xCB, 0xC3, 0xEE, 0x79, 0xBB, 0x4C, 0xA7, 0xCB,
-    0xCB, 0xA0, 0x56, 0x43, 0x61, 0x7D, 0xA7, 0xC7,
-    0x69, 0x90, 0xFD, 0x4D, 0x97, 0x97, 0x41, 0xEE,
-    0x77, 0xDD, 0x5E, 0x0E, 0xD7, 0x41, 0xED, 0x37,
-    0x1D, 0x44, 0x2E, 0x83, 0xE0, 0xE1, 0xF9, 0xBC,
-    0x0C, 0xD2, 0x81, 0xE6, 0x77, 0xD9, 0xB8, 0x4C,
-    0x06, 0xC1, 0xDF, 0x75, 0x39, 0xE8, 0x5C, 0x90,
-    0x97, 0xE5, 0x20, 0xFB, 0x9B, 0x2E, 0x2F, 0x83,
-    0xC6, 0xEF, 0x36, 0x9C, 0x5E, 0x06, 0x4D, 0x8D,
-    0x52, 0xD0, 0xBC, 0x2E, 0x07, 0xDD, 0xEF, 0x77,
-    0xD7, 0xDC, 0x2C, 0x77, 0x99, 0xE5, 0xA0, 0x77,
-    0x1D, 0x04, 0x0F, 0xCB, 0x41, 0xF4, 0x02, 0xBB,
-    0x00, 0x47, 0xBF, 0xDD, 0x65, 0x50, 0xB8, 0x0E,
-    0xCA, 0xD9, 0x66};
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+33609001390");
-  TEST_ENTRY_EQ (sms, "number", "1800");
-  TEST_ENTRY_EQ (sms, "timestamp", "110624130815+02");
-  TEST_ENTRY_EQ (sms, "text",
-                 "Info SFR - Confidentiel, à ne jamais transmettre -\r\n"
-                 "Voici votre nouveau mot de passe : sw2ced pour gérer "
-                 "votre compte SFR sur www.sfr.fr ou par téléphone au 963");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-
-static void
-test_pdu_dcsf_8bit (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0xf4, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0a, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37, 0xde};
-  static const guint8 expected_data[] = {
-    0xe8, 0x32, 0x9b, 0xfd, 0x46, 0x97, 0xd9, 0xec, 0x37, 0xde };
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+12345678901");
-  TEST_ENTRY_EQ (sms, "number", "+18005551212");
-  TEST_ENTRY_EQ (sms, "timestamp", "110101123456+00");
-  TEST_ENTRY_EQ (sms, "text", "");
-  TEST_UINT_ENTRY_EQ (sms, "data-coding-scheme", 0xF4);
-  TEST_ARRAY_ENTRY_EQ (sms, "data", expected_data);
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-
-static void
-test_pdu_insufficient_data (void *f, gpointer d)
-{
-  static const guint8 pdu[] = {
-    0x07, 0x91, 0x21, 0x43, 0x65, 0x87, 0x09, 0xf1,
-    0x04, 0x0b, 0x91, 0x81, 0x00, 0x55, 0x15, 0x12,
-    0xf2, 0x00, 0x00, 0x11, 0x10, 0x10, 0x21, 0x43,
-    0x65, 0x00, 0x0b, 0xe8, 0x32, 0x9b, 0xfd, 0x46,
-    0x97, 0xd9, 0xec, 0x37
-  };
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu, sizeof(pdu));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms == NULL);
-
-  g_free (hexpdu);
-}
-
-
-static void
-test_pdu_udhi (void *f, gpointer d)
-{
-  /* Welcome message from KPN NL */
-  static const char *hexpdu =
-"07911356131313F64004850120390011609232239180A006080400100201D7327BFD6EB340E232"
-"1BF46E83EA7790F59D1E97DBE1341B442F83C465763D3DA797E56537C81D0ECB41AB59CC1693C1"
-"6031D96C064241E5656838AF03A96230982A269BCD462917C8FA4E8FCBED709A0D7ABBE9F6B0FB"
-"5C7683D27350984D4FABC9A0B33C4C4FCF5D20EBFB2D079DCB62793DBD06D9C36E50FB2D4E97D9"
-"A0B49B5E96BBCB";
-  GHashTable *sms;
-  GError *error = NULL;
-
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "+31653131316");
-  TEST_ENTRY_EQ (sms, "number", "1002");
-  TEST_ENTRY_EQ (sms, "timestamp", "110629233219+02");
-  TEST_ENTRY_EQ (sms, "text",
-                 "Welkom, bel om uw Voicemail te beluisteren naar +31612001233"
-                 " (PrePay: *100*1233#). Voicemail ontvangen is altijd gratis."
-                 " Voor gebruik van mobiel interne");
-
-  g_hash_table_unref (sms);
-}
-
-#if 0
-static void
-test_pduX (void *f, gpointer d)
-{
-  GHashTable *sms;
-  GError *error = NULL;
-  char *hexpdu;
-
-  hexpdu = utils_bin2hexstr (pdu1, sizeof(pdu1));
-  sms = sms_parse_pdu (hexpdu, &error);
-  g_assert (sms);
-
-  TEST_ENTRY_EQ (sms, "smsc", "");
-  TEST_ENTRY_EQ (sms, "number", "");
-  TEST_ENTRY_EQ (sms, "timestamp", "");
-  TEST_ENTRY_EQ (sms, "text",
-                "");
-
-  g_free (hexpdu);
-  g_hash_table_unref (sms);
-}
-#endif
-
-static void
-test_encode_sms_addr_encode_smsc_intl (void *f, gpointer d)
-{
-    static const char *addr = "+19037029920";
-    static const guint8 expected[] = { 0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0 };
-    guint enclen;
-    guint8 buf[20];
-
-    enclen = sms_encode_address (addr, buf, sizeof (buf), TRUE);
-    g_assert_cmpint (enclen, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (buf, expected, sizeof (expected)), ==, 0);
-}
-
-static void
-test_encode_sms_addr_encode_smsc_unknown (void *f, gpointer d)
-{
-    static const char *addr = "9037029920";
-    static const guint8 expected[] = { 0x06, 0x81, 0x09, 0x73, 0x20, 0x99, 0x02 };
-    guint enclen;
-    guint8 buf[20];
-
-    enclen = sms_encode_address (addr, buf, sizeof (buf), TRUE);
-    g_assert_cmpint (enclen, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (buf, expected, sizeof (expected)), ==, 0);
-}
-
-static void
-test_encode_sms_addr_encode_intl (void *f, gpointer d)
-{
-    static const char *addr = "+19037029920";
-    static const guint8 expected[] = { 0x0B, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0 };
-    guint enclen;
-    guint8 buf[20];
-
-    enclen = sms_encode_address (addr, buf, sizeof (buf), FALSE);
-    g_assert_cmpint (enclen, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (buf, expected, sizeof (expected)), ==, 0);
-}
-
-static void
-test_encode_sms_addr_encode_unknown (void *f, gpointer d)
-{
-    static const char *addr = "9037029920";
-    static const guint8 expected[] = { 0x0A, 0x81, 0x09, 0x73, 0x20, 0x99, 0x02 };
-    guint enclen;
-    guint8 buf[20];
-
-    enclen = sms_encode_address (addr, buf, sizeof (buf), FALSE);
-    g_assert_cmpint (enclen, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (buf, expected, sizeof (expected)), ==, 0);
-}
-
-static void
-test_create_pdu_ucs2_with_smsc (void *f, gpointer d)
-{
-    static const char *smsc = "+19037029920";
-    static const char *number = "+15555551234";
-    static const char *text = "Да здравствует король, детка!";
-    static const guint8 expected[] = {
-        0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0, 0x11, 0x00, 0x0B, 0x91,
-        0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00, 0x08, 0x00, 0x3A, 0x04, 0x14,
-        0x04, 0x30, 0x00, 0x20, 0x04, 0x37, 0x04, 0x34, 0x04, 0x40, 0x04, 0x30,
-        0x04, 0x32, 0x04, 0x41, 0x04, 0x42, 0x04, 0x32, 0x04, 0x43, 0x04, 0x35,
-        0x04, 0x42, 0x00, 0x20, 0x04, 0x3A, 0x04, 0x3E, 0x04, 0x40, 0x04, 0x3E,
-        0x04, 0x3B, 0x04, 0x4C, 0x00, 0x2C, 0x00, 0x20, 0x04, 0x34, 0x04, 0x35,
-        0x04, 0x42, 0x04, 0x3A, 0x04, 0x30, 0x00, 0x21
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    pdu = sms_create_submit_pdu (number, text, smsc, 5, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 8);
-}
-
-static void
-test_create_pdu_ucs2_no_smsc (void *f, gpointer d)
-{
-    static const char *number = "+15555551234";
-    static const char *text = "Да здравствует король, детка!";
-    static const guint8 expected[] = {
-        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00,
-        0x08, 0x00, 0x3A, 0x04, 0x14, 0x04, 0x30, 0x00, 0x20, 0x04, 0x37, 0x04,
-        0x34, 0x04, 0x40, 0x04, 0x30, 0x04, 0x32, 0x04, 0x41, 0x04, 0x42, 0x04,
-        0x32, 0x04, 0x43, 0x04, 0x35, 0x04, 0x42, 0x00, 0x20, 0x04, 0x3A, 0x04,
-        0x3E, 0x04, 0x40, 0x04, 0x3E, 0x04, 0x3B, 0x04, 0x4C, 0x00, 0x2C, 0x00,
-        0x20, 0x04, 0x34, 0x04, 0x35, 0x04, 0x42, 0x04, 0x3A, 0x04, 0x30, 0x00,
-        0x21
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    pdu = sms_create_submit_pdu (number, text, NULL, 5, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 1);
-}
-
-static void
-test_create_pdu_gsm_with_smsc (void *f, gpointer d)
-{
-    static const char *smsc = "+19037029920";
-    static const char *number = "+15555551234";
-    static const char *text = "Hi there...Tue 17th Jan 2012 05:30.18 pm (GMT+1) ΔΔΔΔΔ";
-    static const guint8 expected[] = {
-        0x07, 0x91, 0x91, 0x30, 0x07, 0x92, 0x29, 0xF0, 0x11, 0x00, 0x0B, 0x91,
-        0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00, 0x00, 0x00, 0x36, 0xC8, 0x34,
-        0x88, 0x8E, 0x2E, 0xCB, 0xCB, 0x2E, 0x97, 0x8B, 0x5A, 0x2F, 0x83, 0x62,
-        0x37, 0x3A, 0x1A, 0xA4, 0x0C, 0xBB, 0x41, 0x32, 0x58, 0x4C, 0x06, 0x82,
-        0xD5, 0x74, 0x33, 0x98, 0x2B, 0x86, 0x03, 0xC1, 0xDB, 0x20, 0xD4, 0xB1,
-        0x49, 0x5D, 0xC5, 0x52, 0x20, 0x08, 0x04, 0x02, 0x81, 0x00
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    pdu = sms_create_submit_pdu (number, text, smsc, 5, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 8);
-}
-
-static void
-test_create_pdu_gsm_no_smsc (void *f, gpointer d)
-{
-    static const char *number = "+15555551234";
-    static const char *text = "Hi there...Tue 17th Jan 2012 05:30.18 pm (GMT+1) ΔΔΔΔΔ";
-    static const guint8 expected[] = {
-        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x55, 0x15, 0x32, 0xF4, 0x00,
-        0x00, 0x00, 0x36, 0xC8, 0x34, 0x88, 0x8E, 0x2E, 0xCB, 0xCB, 0x2E, 0x97,
-        0x8B, 0x5A, 0x2F, 0x83, 0x62, 0x37, 0x3A, 0x1A, 0xA4, 0x0C, 0xBB, 0x41,
-        0x32, 0x58, 0x4C, 0x06, 0x82, 0xD5, 0x74, 0x33, 0x98, 0x2B, 0x86, 0x03,
-        0xC1, 0xDB, 0x20, 0xD4, 0xB1, 0x49, 0x5D, 0xC5, 0x52, 0x20, 0x08, 0x04,
-        0x02, 0x81, 0x00
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    pdu = sms_create_submit_pdu (number, text, NULL, 5, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 1);
-}
-
-static void
-test_create_pdu_gsm_3 (void *f, gpointer d)
-{
-    static const char *number = "+15556661234";
-    static const char *text = "This is really cool ΔΔΔΔΔ";
-    static const guint8 expected[] = {
-        0x00, 0x11, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x66, 0x16, 0x32, 0xF4, 0x00,
-        0x00, 0x00, 0x19, 0x54, 0x74, 0x7A, 0x0E, 0x4A, 0xCF, 0x41, 0xF2, 0x72,
-        0x98, 0xCD, 0xCE, 0x83, 0xC6, 0xEF, 0x37, 0x1B, 0x04, 0x81, 0x40, 0x20,
-        0x10
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    /* Tests that a 25-character message (where the last septet is packed into
-     * an octet by itself) is created correctly.  Previous to
-     * "core: fix some bugs in GSM7 packing code" the GSM packing code would
-     * leave off the last octet.
-     */
-
-    pdu = sms_create_submit_pdu (number, text, NULL, 5, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 1);
-}
-
-static void
-test_create_pdu_gsm_no_validity (void *f, gpointer d)
-{
-    static const char *number = "+15556661234";
-    static const char *text = "This is really cool ΔΔΔΔΔ";
-    static const guint8 expected[] = {
-        0x00, 0x01, 0x00, 0x0B, 0x91, 0x51, 0x55, 0x66, 0x16, 0x32, 0xF4, 0x00,
-        0x00, 0x19, 0x54, 0x74, 0x7A, 0x0E, 0x4A, 0xCF, 0x41, 0xF2, 0x72, 0x98,
-        0xCD, 0xCE, 0x83, 0xC6, 0xEF, 0x37, 0x1B, 0x04, 0x81, 0x40, 0x20, 0x10
-    };
-    guint8 *pdu;
-    guint len = 0, msgstart = 0;
-    GError *error = NULL;
-
-    pdu = sms_create_submit_pdu (number, text, NULL, 0, 0, &len, &msgstart, &error);
-    g_assert_no_error (error);
-    g_assert (pdu);
-    g_assert_cmpint (len, ==, sizeof (expected));
-    g_assert_cmpint (memcmp (pdu, expected, len), ==, 0);
-    g_assert_cmpint (msgstart, ==, 1);
-}
-
-#if 0
-{
-int i;
-g_print ("\n        ");
-for (i = 0; i < len; i++) {
-   g_print ("  0x%02X", pdu[i]);
-   if (((i + 1) % 12) == 0)
-      g_print ("\n        ");
-}
-g_print ("\n");
-}
-#endif
-
-#if GLIB_CHECK_VERSION(2,25,12)
-typedef GTestFixtureFunc TCFunc;
-#else
-typedef void (*TCFunc)(void);
-#endif
-
-#define TESTCASE(t, d) g_test_create_case (#t, 0, d, NULL, (TCFunc) t, NULL)
-
-int main (int argc, char **argv)
-{
-    GTestSuite *suite;
-    gint result;
-
-    g_type_init ();
-
-    g_test_init (&argc, &argv, NULL);
-
-    suite = g_test_get_root ();
-
-    g_test_suite_add (suite, TESTCASE (test_pdu1, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu2, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu3, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu3_nzpid, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu3_mms, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu3_natl, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu3_8bit, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu_dcsf1, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu_dcsf_8bit, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu_insufficient_data, NULL));
-    g_test_suite_add (suite, TESTCASE (test_pdu_udhi, NULL));
-
-    g_test_suite_add (suite, TESTCASE (test_encode_sms_addr_encode_smsc_intl, NULL));
-    g_test_suite_add (suite, TESTCASE (test_encode_sms_addr_encode_smsc_unknown, NULL));
-    g_test_suite_add (suite, TESTCASE (test_encode_sms_addr_encode_intl, NULL));
-    g_test_suite_add (suite, TESTCASE (test_encode_sms_addr_encode_unknown, NULL));
-
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_ucs2_with_smsc, NULL));
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_ucs2_no_smsc, NULL));
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_gsm_with_smsc, NULL));
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_gsm_no_smsc, NULL));
-
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_gsm_3, NULL));
-    g_test_suite_add (suite, TESTCASE (test_create_pdu_gsm_no_validity, NULL));
-
-    result = g_test_run ();
-
-    return result;
-}