X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=tests%2Funiconv%2Ftest-u16-conv-from-enc.c;h=05e8b248909897178e36165c4f12fc2dc0ca6297;hb=a2c2ba90cc40932a38c6cf93e15bf2bdf82d6c4f;hp=69467e00d94b6db9741b3f3fb3a14029d05287fc;hpb=e220635fc952c63b533873f2af39ec76aed4b4e3;p=gnulib.git

diff --git a/tests/uniconv/test-u16-conv-from-enc.c b/tests/uniconv/test-u16-conv-from-enc.c
index 69467e00d..05e8b2489 100644
--- a/tests/uniconv/test-u16-conv-from-enc.c
+++ b/tests/uniconv/test-u16-conv-from-enc.c
@@ -1,5 +1,5 @@
 /* Test of conversion to UTF-16 from legacy encodings.
-   Copyright (C) 2007-2008 Free Software Foundation, Inc.
+   Copyright (C) 2007-2010 Free Software Foundation, Inc.
 
    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
@@ -20,24 +20,11 @@
 
 #include "uniconv.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 
 #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__); \
-          fflush (stderr);						     \
-          abort ();							     \
-        }								     \
-    }									     \
-  while (0)
+#include "macros.h"
 
 /* Magic number for detecting bounds violations.  */
 #define MAGIC 0x1983EFF1
@@ -69,32 +56,31 @@ main ()
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "\304rger mit b\366sen B\374bchen ohne Augenma\337";
       static const uint16_t expected[] = /* Ä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
+        };
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  uint16_t *result = NULL;
-	  size_t length = 0;
-	  int retval = u16_conv_from_encoding ("ISO-8859-1", handler,
-					       input, strlen (input),
-					       offsets,
-					       &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == SIZEOF (expected));
-	  ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 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 (strlen (input)) : NULL);
+          size_t length;
+          uint16_t *result = u16_conv_from_encoding ("ISO-8859-1", handler,
+                                                     input, strlen (input),
+                                                     offsets,
+                                                     NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == SIZEOF (expected));
+          ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 37; i++)
+                ASSERT (offsets[i] == i);
+              ASSERT (offsets[37] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
 
   /* Test conversion from ISO-8859-2 to UTF-16 with no errors.  */
@@ -103,131 +89,127 @@ main ()
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "Rafa\263 Maszkowski"; /* Rafał Maszkowski */
       static const uint16_t expected[] =
-	{
-	  '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 (strlen (input)) : NULL);
-	  uint16_t *result = NULL;
-	  size_t length = 0;
-	  int retval = u16_conv_from_encoding ("ISO-8859-2", handler,
-					       input, strlen (input),
-					       offsets,
-					       &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == SIZEOF (expected));
-	  ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 16; i++)
-		ASSERT (offsets[i] == i);
-	      ASSERT (offsets[16] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint16_t *result = u16_conv_from_encoding ("ISO-8859-2", handler,
+                                                     input, strlen (input),
+                                                     offsets,
+                                                     NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == SIZEOF (expected));
+          ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 16; i++)
+                ASSERT (offsets[i] == i);
+              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-16.  */
   for (h = 0; h < SIZEOF (handlers); h++)
     {
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "\244\263\244\363\244\313\244\301\244\317"; /* こんにちは in EUC-JP */
       static const uint16_t expected[] = /* こんにちは */
-	{
-	  0x3053, 0x3093, 0x306B, 0x3061, 0x306F
-	};
+        {
+          0x3053, 0x3093, 0x306B, 0x3061, 0x306F
+        };
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  uint16_t *result = NULL;
-	  size_t length = 0;
-	  int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-					       input, strlen (input),
-					       offsets,
-					       &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == SIZEOF (expected));
-	  ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 10; i++)
-		ASSERT (offsets[i] == ((i % 2) == 0 ? i / 2 : (size_t)(-1)));
-	      ASSERT (offsets[10] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                     input, strlen (input),
+                                                     offsets,
+                                                     NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == SIZEOF (expected));
+          ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 10; i++)
+                ASSERT (offsets[i] == ((i % 2) == 0 ? i / 2 : (size_t)(-1)));
+              ASSERT (offsets[10] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
   for (h = 0; h < SIZEOF (handlers); h++)
     {
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "\202\261\202\361\202\311\202\277\202\315"; /* こんにちは in Shift_JIS */
       static const uint16_t expected[] = /* こんにちは */
-	{
-	  0x3053, 0x3093, 0x306B, 0x3061, 0x306F
-	};
+        {
+          0x3053, 0x3093, 0x306B, 0x3061, 0x306F
+        };
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  uint16_t *result = NULL;
-	  size_t length = 0;
-	  int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-					       input, strlen (input),
-					       offsets,
-					       &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == SIZEOF (expected));
-	  ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 10; i++)
-		ASSERT (offsets[i] == ((i % 2) == 0 ? i / 2 : (size_t)(-1)));
-	      ASSERT (offsets[10] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                     input, strlen (input),
+                                                     offsets,
+                                                     NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == SIZEOF (expected));
+          ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 10; i++)
+                ASSERT (offsets[i] == ((i % 2) == 0 ? i / 2 : (size_t)(-1)));
+              ASSERT (offsets[10] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
   for (h = 0; h < SIZEOF (handlers); h++)
     {
       enum iconv_ilseq_handler handler = handlers[h];
       static const char input[] = "\033$B$3$s$K$A$O\033(B"; /* こんにちは in ISO-2022-JP-2 */
       static const uint16_t expected[] = /* こんにちは */
-	{
-	  0x3053, 0x3093, 0x306B, 0x3061, 0x306F
-	};
+        {
+          0x3053, 0x3093, 0x306B, 0x3061, 0x306F
+        };
       for (o = 0; o < 2; o++)
-	{
-	  size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
-	  uint16_t *result = NULL;
-	  size_t length = 0;
-	  int retval = u16_conv_from_encoding ("autodetect_jp", handler,
-					       input, strlen (input),
-					       offsets,
-					       &result, &length);
-	  ASSERT (retval == 0);
-	  ASSERT (length == SIZEOF (expected));
-	  ASSERT (result != NULL && u16_cmp (result, expected, SIZEOF (expected)) == 0);
-	  if (o)
-	    {
-	      for (i = 0; i < 16; i++)
-		ASSERT (offsets[i] == (i == 0 ? 0 :
-				       i == 5 ? 1 :
-				       i == 7 ? 2 :
-				       i == 9 ? 3 :
-				       i == 11 ? 4 :
-				       i == 13 ? 5 :
-				       (size_t)(-1)));
-	      ASSERT (offsets[16] == MAGIC);
-	      free (offsets);
-	    }
-	  free (result);
-	}
+        {
+          size_t *offsets = (o ? new_offsets (strlen (input)) : NULL);
+          size_t length;
+          uint16_t *result = u16_conv_from_encoding ("autodetect_jp", handler,
+                                                     input, strlen (input),
+                                                     offsets,
+                                                     NULL, &length);
+          ASSERT (result != NULL);
+          ASSERT (length == SIZEOF (expected));
+          ASSERT (u16_cmp (result, expected, SIZEOF (expected)) == 0);
+          if (o)
+            {
+              for (i = 0; i < 16; i++)
+                ASSERT (offsets[i] == (i == 0 ? 0 :
+                                       i == 5 ? 1 :
+                                       i == 7 ? 2 :
+                                       i == 9 ? 3 :
+                                       i == 11 ? 4 :
+                                       i == 13 ? 5 :
+                                       (size_t)(-1)));
+              ASSERT (offsets[16] == MAGIC);
+              free (offsets);
+            }
+          free (result);
+        }
     }
 # endif