X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Funiconv%2Ftest-u8-conv-from-enc.c;h=982e5208ee75231d6c1512b319b65c450ce4c28d;hb=6ed6dffbe79bcf95e2ed5593eee94ab32fcde3f4;hp=95cd1003d9e34025eacc32ff25fade763a96577c;hpb=75d146361fe980e1e1bbb9639edc6fbed5345e82;p=gnulib.git
diff --git a/tests/uniconv/test-u8-conv-from-enc.c b/tests/uniconv/test-u8-conv-from-enc.c
index 95cd1003d..982e5208e 100644
--- a/tests/uniconv/test-u8-conv-from-enc.c
+++ b/tests/uniconv/test-u8-conv-from-enc.c
@@ -1,10 +1,10 @@
/* Test of conversion to UTF-8 from legacy encodings.
- Copyright (C) 2007 Free Software Foundation, Inc.
+ Copyright (C) 2007-2012 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 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
@@ -12,34 +12,19 @@
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 Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see . */
/* Written by Bruno Haible , 2007. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
#include "uniconv.h"
-#include
#include
#include
#include "unistr.h"
-
-#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
-#define ASSERT(expr) \
- do \
- { \
- if (!(expr)) \
- { \
- fprintf (stderr, "%s:%d: assertion failed\n", __FILE__, __LINE__); \
- abort (); \
- } \
- } \
- while (0)
+#include "macros.h"
/* Magic number for detecting bounds violations. */
#define MAGIC 0x1983EFF1
@@ -72,29 +57,28 @@ main ()
static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
static const uint8_t expected[] = "\303\204rger mit b\303\266sen B\303\274bchen ohne Augenma\303\237";
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint8_t *result = NULL;
- size_t length = 0;
- int retval = u8_conv_from_encoding ("ISO-8859-1", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == u8_strlen (expected));
- ASSERT (result != NULL && u8_cmp (result, expected, u8_strlen (expected)) == 0);
- if (o)
- {
- for (i = 0; i < 37; i++)
- ASSERT (offsets[i] == (i < 1 ? i :
- i < 12 ? i + 1 :
- i < 18 ? i + 2 :
- i + 3));
- ASSERT (offsets[37] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+ size_t length;
+ uint8_t *result = u8_conv_from_encoding ("ISO-8859-1", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == u8_strlen (expected));
+ ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+ if (o)
+ {
+ for (i = 0; i < 37; i++)
+ ASSERT (offsets[i] == (i < 1 ? i :
+ i < 12 ? i + 1 :
+ i < 18 ? i + 2 :
+ i + 3));
+ ASSERT (offsets[37] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
/* Test conversion from ISO-8859-2 to UTF-8 with no errors. */
@@ -104,31 +88,30 @@ main ()
static const char input[] = "Rafa\263 Maszkowski"; /* RafaÅ Maszkowski */
static const uint8_t expected[] = "Rafa\305\202 Maszkowski";
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint8_t *result = NULL;
- size_t length = 0;
- int retval = u8_conv_from_encoding ("ISO-8859-2", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == u8_strlen (expected));
- ASSERT (result != NULL && u8_cmp (result, expected, u8_strlen (expected)) == 0);
- if (o)
- {
- for (i = 0; i < 16; i++)
- ASSERT (offsets[i] == (i < 5 ? i :
- i + 1));
- ASSERT (offsets[16] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+ size_t length;
+ uint8_t *result = u8_conv_from_encoding ("ISO-8859-2", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == u8_strlen (expected));
+ ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+ if (o)
+ {
+ for (i = 0; i < 16; i++)
+ ASSERT (offsets[i] == (i < 5 ? i :
+ i + 1));
+ ASSERT (offsets[16] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
/* autodetect_jp is only supported when iconv() support ISO-2022-JP-2. */
-# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__)
+# if defined _LIBICONV_VERSION || !(defined _AIX || defined __sgi || defined __hpux || defined __osf__ || defined __sun)
/* Test conversions from autodetect_jp to UTF-8. */
for (h = 0; h < SIZEOF (handlers); h++)
{
@@ -136,26 +119,25 @@ main ()
static const char input[] = "\244\263\244\363\244\313\244\301\244\317"; /* ããã«ã¡ã¯ in EUC-JP */
static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* ããã«ã¡ã¯ */
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint8_t *result = NULL;
- size_t length = 0;
- int retval = u8_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == u8_strlen (expected));
- ASSERT (result != NULL && u8_cmp (result, expected, u8_strlen (expected)) == 0);
- if (o)
- {
- for (i = 0; i < 10; i++)
- ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
- ASSERT (offsets[10] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+ size_t length;
+ uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == u8_strlen (expected));
+ ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+ if (o)
+ {
+ for (i = 0; i < 10; i++)
+ ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
+ ASSERT (offsets[10] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
for (h = 0; h < SIZEOF (handlers); h++)
{
@@ -163,26 +145,25 @@ main ()
static const char input[] = "\202\261\202\361\202\311\202\277\202\315"; /* ããã«ã¡ã¯ in Shift_JIS */
static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* ããã«ã¡ã¯ */
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint8_t *result = NULL;
- size_t length = 0;
- int retval = u8_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == u8_strlen (expected));
- ASSERT (result != NULL && u8_cmp (result, expected, u8_strlen (expected)) == 0);
- if (o)
- {
- for (i = 0; i < 10; i++)
- ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
- ASSERT (offsets[10] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+ size_t length;
+ uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == u8_strlen (expected));
+ ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+ if (o)
+ {
+ for (i = 0; i < 10; i++)
+ ASSERT (offsets[i] == ((i % 2) == 0 ? (i / 2) * 3 : (size_t)(-1)));
+ ASSERT (offsets[10] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
for (h = 0; h < SIZEOF (handlers); h++)
{
@@ -190,32 +171,31 @@ main ()
static const char input[] = "\033$B$3$s$K$A$O\033(B"; /* ããã«ã¡ã¯ in ISO-2022-JP-2 */
static const uint8_t expected[] = "\343\201\223\343\202\223\343\201\253\343\201\241\343\201\257"; /* ããã«ã¡ã¯ */
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
- uint8_t *result = NULL;
- size_t length = 0;
- int retval = u8_conv_from_encoding ("autodetect_jp", handler,
- input, strlen (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == u8_strlen (expected));
- ASSERT (result != NULL && u8_cmp (result, expected, u8_strlen (expected)) == 0);
- if (o)
- {
- for (i = 0; i < 16; i++)
- ASSERT (offsets[i] == (i == 0 ? 0 :
- i == 5 ? 3 :
- i == 7 ? 6 :
- i == 9 ? 9 :
- i == 11 ? 12 :
- i == 13 ? 15 :
- (size_t)(-1)));
- ASSERT (offsets[16] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+ size_t length;
+ uint8_t *result = u8_conv_from_encoding ("autodetect_jp", handler,
+ input, strlen (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == u8_strlen (expected));
+ ASSERT (u8_cmp (result, expected, u8_strlen (expected)) == 0);
+ if (o)
+ {
+ for (i = 0; i < 16; i++)
+ ASSERT (offsets[i] == (i == 0 ? 0 :
+ i == 5 ? 3 :
+ i == 7 ? 6 :
+ i == 9 ? 9 :
+ i == 11 ? 12 :
+ i == 13 ? 15 :
+ (size_t)(-1)));
+ ASSERT (offsets[16] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
# endif