X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=tests%2Funiconv%2Ftest-u32-conv-to-enc.c;h=e9bf4ff618b490c4a284a14d0feff7b482665ffe;hb=cecd5115b408a0c0d04af38206d897a627bded76;hp=ba7605ad16afd74be3b04589eb8fe8da18e611c1;hpb=692c362ef04976a871799fb721f24fcda5efde84;p=gnulib.git
diff --git a/tests/uniconv/test-u32-conv-to-enc.c b/tests/uniconv/test-u32-conv-to-enc.c
index ba7605ad1..e9bf4ff61 100644
--- a/tests/uniconv/test-u32-conv-to-enc.c
+++ b/tests/uniconv/test-u32-conv-to-enc.c
@@ -1,10 +1,10 @@
/* Test of conversion from UTF-32 to 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,8 +12,7 @@
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. */
@@ -22,21 +21,10 @@
#include "uniconv.h"
#include
-#include
#include
#include
-#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
@@ -67,34 +55,32 @@ main ()
{
enum iconv_ilseq_handler handler = handlers[h];
static const uint32_t input[] = /* Ãrger mit bösen Bübchen ohne Augenmaà */
- {
- 0xC4, 'r', 'g', 'e', 'r', ' ', 'm', 'i', 't', ' ', 'b', 0xF6, 's',
- 'e', 'n', ' ', 'B', 0xFC, 'b', 'c', 'h', 'e', 'n', ' ', 'o', 'h',
- 'n', 'e', ' ', 'A', 'u', 'g', 'e', 'n', 'm', 'a', 0xDF
- };
+ {
+ 0xC4, 'r', 'g', 'e', 'r', ' ', 'm', 'i', 't', ' ', 'b', 0xF6, 's',
+ 'e', 'n', ' ', 'B', 0xFC, 'b', 'c', 'h', 'e', 'n', ' ', 'o', 'h',
+ 'n', 'e', ' ', 'A', 'u', 'g', 'e', 'n', 'm', 'a', 0xDF
+ };
static const char expected[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
- char *result = NULL;
- size_t length = 0;
- int retval = u32_conv_to_encoding ("ISO-8859-1", handler,
- input, SIZEOF (input),
- offsets,
- &result, &length);
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
- ASSERT (result != NULL);
- ASSERT (memcmp (result, expected, length) == 0);
- if (o)
- {
- for (i = 0; i < 37; i++)
- ASSERT (offsets[i] == i);
- ASSERT (offsets[37] == MAGIC);
- free (offsets);
- }
- free (result);
- }
+ {
+ size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
+ size_t length;
+ char *result = u32_conv_to_encoding ("ISO-8859-1", handler,
+ input, SIZEOF (input),
+ offsets,
+ NULL, &length);
+ ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
+ ASSERT (memcmp (result, expected, length) == 0);
+ if (o)
+ {
+ for (i = 0; i < 37; i++)
+ ASSERT (offsets[i] == i);
+ ASSERT (offsets[37] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
}
/* Test conversion from UTF-32 to ISO-8859-1 with EILSEQ. */
@@ -102,64 +88,61 @@ main ()
{
enum iconv_ilseq_handler handler = handlers[h];
static const uint32_t input[] = /* RafaÅ Maszkowski */
- {
- 'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
- 's', 'k', 'i'
- };
+ {
+ 'R', 'a', 'f', 'a', 0x0142, ' ', 'M', 'a', 's', 'z', 'k', 'o', 'w',
+ 's', 'k', 'i'
+ };
for (o = 0; o < 2; o++)
- {
- size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
- char *result = NULL;
- size_t length = 0;
- int retval = u32_conv_to_encoding ("ISO-8859-1", handler,
- input, SIZEOF (input),
- offsets,
- &result, &length);
- switch (handler)
- {
- case iconveh_error:
- ASSERT (retval == -1 && errno == EILSEQ);
- ASSERT (result == NULL);
- ASSERT (length == 0);
- break;
- case iconveh_question_mark:
- {
- static const char expected[] = "Rafa? Maszkowski";
- static const char expected_translit[] = "Rafal Maszkowski";
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
- ASSERT (result != NULL);
- ASSERT (memcmp (result, expected, length) == 0
- || memcmp (result, expected_translit, length) == 0);
- if (o)
- {
- for (i = 0; i < 16; i++)
- ASSERT (offsets[i] == i);
- ASSERT (offsets[16] == MAGIC);
- free (offsets);
- }
- free (result);
- }
- break;
- case iconveh_escape_sequence:
- {
- static const char expected[] = "Rafa\\u0142 Maszkowski";
- ASSERT (retval == 0);
- ASSERT (length == strlen (expected));
- ASSERT (result != NULL);
- ASSERT (memcmp (result, expected, length) == 0);
- if (o)
- {
- for (i = 0; i < 16; i++)
- ASSERT (offsets[i] == (i < 5 ? i : i + 5));
- ASSERT (offsets[16] == MAGIC);
- free (offsets);
- }
- free (result);
- }
- break;
- }
- }
+ {
+ size_t *offsets = (o ? new_offsets (SIZEOF (input)) : NULL);
+ size_t length = 0xdead;
+ char *result = u32_conv_to_encoding ("ISO-8859-1", handler,
+ input, SIZEOF (input),
+ offsets,
+ NULL, &length);
+ switch (handler)
+ {
+ case iconveh_error:
+ ASSERT (result == NULL);
+ ASSERT (errno == EILSEQ);
+ ASSERT (length == 0xdead);
+ break;
+ case iconveh_question_mark:
+ {
+ static const char expected[] = "Rafa? Maszkowski";
+ static const char expected_translit[] = "Rafal Maszkowski";
+ ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
+ ASSERT (memcmp (result, expected, length) == 0
+ || memcmp (result, expected_translit, length) == 0);
+ if (o)
+ {
+ for (i = 0; i < 16; i++)
+ ASSERT (offsets[i] == i);
+ ASSERT (offsets[16] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
+ break;
+ case iconveh_escape_sequence:
+ {
+ static const char expected[] = "Rafa\\u0142 Maszkowski";
+ ASSERT (result != NULL);
+ ASSERT (length == strlen (expected));
+ ASSERT (memcmp (result, expected, length) == 0);
+ if (o)
+ {
+ for (i = 0; i < 16; i++)
+ ASSERT (offsets[i] == (i < 5 ? i : i + 5));
+ ASSERT (offsets[16] == MAGIC);
+ free (offsets);
+ }
+ free (result);
+ }
+ break;
+ }
+ }
}
#endif