diff options
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/test-charsets.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/tests/test-charsets.c b/src/tests/test-charsets.c index 0931d7e8..5c9e1875 100644 --- a/src/tests/test-charsets.c +++ b/src/tests/test-charsets.c @@ -316,15 +316,13 @@ test_gsm7_pack_7_chars_offset (void) static void test_take_convert_ucs2_hex_utf8 (void) { - gchar *src, *converted, *utf8; + gchar *src, *converted; /* Ensure hex-encoded UCS-2 works */ src = g_strdup ("0054002d004d006f00620069006c0065"); converted = mm_charset_take_and_convert_to_utf8 (src, MM_MODEM_CHARSET_UCS2); g_assert_cmpstr (converted, ==, "T-Mobile"); - utf8 = mm_utf8_take_and_convert_to_charset (converted, MM_MODEM_CHARSET_UCS2); - g_assert_cmpstr (utf8, ==, "0054002D004D006F00620069006C0065"); - g_free (utf8); + g_free (converted); } static void @@ -350,19 +348,6 @@ test_take_convert_ucs2_bad_ascii2 (void) g_assert (converted == NULL); } -static void -test_take_convert_gsm_utf8 (void) -{ - gchar *src, *converted, *utf8; - - src = g_strdup ("T-Mobile"); - converted = mm_charset_take_and_convert_to_utf8 (src, MM_MODEM_CHARSET_GSM); - g_assert_cmpstr (converted, ==, "T-Mobile"); - utf8 = mm_utf8_take_and_convert_to_charset (converted, MM_MODEM_CHARSET_GSM); - g_assert_cmpstr (utf8, ==, "T-Mobile"); - g_free (utf8); -} - struct charset_can_convert_to_test_s { const char *utf8; gboolean to_gsm; @@ -445,7 +430,6 @@ int main (int argc, char **argv) g_test_add_func ("/MM/charsets/take-convert/ucs2/hex", test_take_convert_ucs2_hex_utf8); g_test_add_func ("/MM/charsets/take-convert/ucs2/bad-ascii", test_take_convert_ucs2_bad_ascii); g_test_add_func ("/MM/charsets/take-convert/ucs2/bad-ascii-2", test_take_convert_ucs2_bad_ascii2); - g_test_add_func ("/MM/charsets/take-convert/gsm", test_take_convert_gsm_utf8); g_test_add_func ("/MM/charsets/can-convert-to", test_charset_can_covert_to); |