Move utf8 validation tests to the test framework

2 files changed, 0 insertions, 322 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 44afe9541..967a88c02 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -125,7 +125,6 @@ test_programs =					\
 	type-test				\
 	unicode-caseconv			\
 	unicode-encoding			\
-	utf8-validate				\
 	uri-test
 
 test_scripts = run-markup-tests.sh run-collate-tests.sh run-bookmark-test.sh run-assert-msg-test.sh
@@ -189,8 +188,6 @@ type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
 unicode_collate_LDADD = $(progs_ldadd)
-utf8_validate_LDADD = $(progs_ldadd)
-utf8_pointer_LDADD = $(progs_ldadd)
 uri_test_LDADD = $(progs_ldadd)
 markup_collect_LDADD = $(progs_ldadd)
 
diff --git a/tests/utf8-validate.c b/tests/utf8-validate.c
deleted file mode 100644
index 98f0b1f86..000000000
--- a/tests/utf8-validate.c
+++ /dev/null
@@ -1,319 +0,0 @@
-/* GLIB - Library of useful routines for C programming
- * Copyright (C) 2001 Matthias Clasen <matthiasc@poet.de>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library 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
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#include "glib.h"
-
-#define UNICODE_VALID(Char)                   \
-    ((Char) < 0x110000 &&                     \
-     (((Char) & 0xFFFFF800) != 0xD800) &&     \
-     ((Char) < 0xFDD0 || (Char) > 0xFDEF) &&  \
-     ((Char) & 0xFFFE) != 0xFFFE)
-
-
-
-static gboolean any_failed = FALSE;
-
-struct {
-  const gchar *text;
-  gint max_len;
-  gint offset;
-  gboolean valid;
-} test[] = {  
-  /* some tests to check max_len handling */
-  /* length 1 */
-  { "abcde", -1, 5, TRUE },
-  { "abcde", 3, 3, TRUE },
-  { "abcde", 5, 5, TRUE },
-  { "abcde", 7, 5, FALSE },
-  /* length 2 */
-  { "\xc2\xa9\xc2\xa9\xc2\xa9", -1, 6, TRUE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  1, 0, FALSE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  2, 2, TRUE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  3, 2, FALSE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  4, 4, TRUE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  5, 4, FALSE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  6, 6, TRUE }, 
-  { "\xc2\xa9\xc2\xa9\xc2\xa9",  7, 6, FALSE }, 
-  /* length 3 */
-  { "\xe2\x89\xa0\xe2\x89\xa0", -1, 6, TRUE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  1, 0, FALSE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  2, 0, FALSE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  3, 3, TRUE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  4, 3, FALSE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  5, 3, FALSE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  6, 6, TRUE },
-  { "\xe2\x89\xa0\xe2\x89\xa0",  7, 6, FALSE },
-
-  /* examples from http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt */
-  /* greek 'kosme' */
-  { "\xce\xba\xe1\xbd\xb9\xcf\x83\xce\xbc\xce\xb5", -1, 11, TRUE },
-  /* first sequence of each length */
-  { "\x00", -1, 0, TRUE },
-  { "\xc2\x80", -1, 2, TRUE },
-  { "\xe0\xa0\x80", -1, 3, TRUE },
-  { "\xf0\x90\x80\x80", -1, 4, TRUE },
-  { "\xf8\x88\x80\x80\x80", -1, 0, FALSE },
-  { "\xfc\x84\x80\x80\x80\x80", -1, 0, FALSE },
-  /* last sequence of each length */
-  { "\x7f", -1, 1, TRUE },
-  { "\xdf\xbf", -1, 2, TRUE },
-  { "\xef\xbf\xbf", -1, 0, FALSE },
-  { "\xf7\xbf\xbf\xbf", -1, 0, FALSE },
-  { "\xfb\xbf\xbf\xbf\xbf", -1, 0, FALSE },
-  { "\xfd\xbf\xbf\xbf\xbf\xbf", -1, 0, FALSE },
-  /* other boundary conditions */
-  { "\xed\x9f\xbf", -1, 3, TRUE },
-  { "\xee\x80\x80", -1, 3, TRUE },
-  { "\xef\xbf\xbd", -1, 3, TRUE },
-  { "\xf4\x8f\xbf\xbf", -1, 0, FALSE },
-  { "\xf4\x90\x80\x80", -1, 0, FALSE },
-  /* malformed sequences */
-  /* continuation bytes */
-  { "\x80", -1, 0, FALSE },
-  { "\xbf", -1, 0, FALSE },
-  { "\x80\xbf", -1, 0, FALSE },
-  { "\x80\xbf\x80", -1, 0, FALSE },
-  { "\x80\xbf\x80\xbf", -1, 0, FALSE },
-  { "\x80\xbf\x80\xbf\x80", -1, 0, FALSE },
-  { "\x80\xbf\x80\xbf\x80\xbf", -1, 0, FALSE },
-  { "\x80\xbf\x80\xbf\x80\xbf\x80", -1, 0, FALSE },
-
-  /* all possible continuation byte */
-  { "\x80", -1, 0, FALSE },
-  { "\x81", -1, 0, FALSE },
-  { "\x82", -1, 0, FALSE },
-  { "\x83", -1, 0, FALSE },
-  { "\x84", -1, 0, FALSE },
-  { "\x85", -1, 0, FALSE },
-  { "\x86", -1, 0, FALSE },
-  { "\x87", -1, 0, FALSE },
-  { "\x88", -1, 0, FALSE },
-  { "\x89", -1, 0, FALSE },
-  { "\x8a", -1, 0, FALSE },
-  { "\x8b", -1, 0, FALSE },
-  { "\x8c", -1, 0, FALSE },
-  { "\x8d", -1, 0, FALSE },
-  { "\x8e", -1, 0, FALSE },
-  { "\x8f", -1, 0, FALSE },
-  { "\x90", -1, 0, FALSE },
-  { "\x91", -1, 0, FALSE },
-  { "\x92", -1, 0, FALSE },
-  { "\x93", -1, 0, FALSE },
-  { "\x94", -1, 0, FALSE },
-  { "\x95", -1, 0, FALSE },
-  { "\x96", -1, 0, FALSE },
-  { "\x97", -1, 0, FALSE },
-  { "\x98", -1, 0, FALSE },
-  { "\x99", -1, 0, FALSE },
-  { "\x9a", -1, 0, FALSE },
-  { "\x9b", -1, 0, FALSE },
-  { "\x9c", -1, 0, FALSE },
-  { "\x9d", -1, 0, FALSE },
-  { "\x9e", -1, 0, FALSE },
-  { "\x9f", -1, 0, FALSE },
-  { "\xa0", -1, 0, FALSE },
-  { "\xa1", -1, 0, FALSE },
-  { "\xa2", -1, 0, FALSE },
-  { "\xa3", -1, 0, FALSE },
-  { "\xa4", -1, 0, FALSE },
-  { "\xa5", -1, 0, FALSE },
-  { "\xa6", -1, 0, FALSE },
-  { "\xa7", -1, 0, FALSE },
-  { "\xa8", -1, 0, FALSE },
-  { "\xa9", -1, 0, FALSE },
-  { "\xaa", -1, 0, FALSE },
-  { "\xab", -1, 0, FALSE },
-  { "\xac", -1, 0, FALSE },
-  { "\xad", -1, 0, FALSE },
-  { "\xae", -1, 0, FALSE },
-  { "\xaf", -1, 0, FALSE },
-  { "\xb0", -1, 0, FALSE },
-  { "\xb1", -1, 0, FALSE },
-  { "\xb2", -1, 0, FALSE },
-  { "\xb3", -1, 0, FALSE },
-  { "\xb4", -1, 0, FALSE },
-  { "\xb5", -1, 0, FALSE },
-  { "\xb6", -1, 0, FALSE },
-  { "\xb7", -1, 0, FALSE },
-  { "\xb8", -1, 0, FALSE },
-  { "\xb9", -1, 0, FALSE },
-  { "\xba", -1, 0, FALSE },
-  { "\xbb", -1, 0, FALSE },
-  { "\xbc", -1, 0, FALSE },
-  { "\xbd", -1, 0, FALSE },
-  { "\xbe", -1, 0, FALSE },
-  { "\xbf", -1, 0, FALSE },
-  /* lone start characters */
-  { "\xc0\x20", -1, 0, FALSE },
-  { "\xc1\x20", -1, 0, FALSE },
-  { "\xc2\x20", -1, 0, FALSE },
-  { "\xc3\x20", -1, 0, FALSE },
-  { "\xc4\x20", -1, 0, FALSE },
-  { "\xc5\x20", -1, 0, FALSE },
-  { "\xc6\x20", -1, 0, FALSE },
-  { "\xc7\x20", -1, 0, FALSE },
-  { "\xc8\x20", -1, 0, FALSE },
-  { "\xc9\x20", -1, 0, FALSE },
-  { "\xca\x20", -1, 0, FALSE },
-  { "\xcb\x20", -1, 0, FALSE },
-  { "\xcc\x20", -1, 0, FALSE },
-  { "\xcd\x20", -1, 0, FALSE },
-  { "\xce\x20", -1, 0, FALSE },
-  { "\xcf\x20", -1, 0, FALSE },
-  { "\xd0\x20", -1, 0, FALSE },
-  { "\xd1\x20", -1, 0, FALSE },
-  { "\xd2\x20", -1, 0, FALSE },
-  { "\xd3\x20", -1, 0, FALSE },
-  { "\xd4\x20", -1, 0, FALSE },
-  { "\xd5\x20", -1, 0, FALSE },
-  { "\xd6\x20", -1, 0, FALSE },
-  { "\xd7\x20", -1, 0, FALSE },
-  { "\xd8\x20", -1, 0, FALSE },
-  { "\xd9\x20", -1, 0, FALSE },
-  { "\xda\x20", -1, 0, FALSE },
-  { "\xdb\x20", -1, 0, FALSE },
-  { "\xdc\x20", -1, 0, FALSE },
-  { "\xdd\x20", -1, 0, FALSE },
-  { "\xde\x20", -1, 0, FALSE },
-  { "\xdf\x20", -1, 0, FALSE },
-  { "\xe0\x20", -1, 0, FALSE },
-  { "\xe1\x20", -1, 0, FALSE },
-  { "\xe2\x20", -1, 0, FALSE },
-  { "\xe3\x20", -1, 0, FALSE },
-  { "\xe4\x20", -1, 0, FALSE },
-  { "\xe5\x20", -1, 0, FALSE },
-  { "\xe6\x20", -1, 0, FALSE },
-  { "\xe7\x20", -1, 0, FALSE },
-  { "\xe8\x20", -1, 0, FALSE },
-  { "\xe9\x20", -1, 0, FALSE },
-  { "\xea\x20", -1, 0, FALSE },
-  { "\xeb\x20", -1, 0, FALSE },
-  { "\xec\x20", -1, 0, FALSE },
-  { "\xed\x20", -1, 0, FALSE },
-  { "\xee\x20", -1, 0, FALSE },
-  { "\xef\x20", -1, 0, FALSE },
-  { "\xf0\x20", -1, 0, FALSE },
-  { "\xf1\x20", -1, 0, FALSE },
-  { "\xf2\x20", -1, 0, FALSE },
-  { "\xf3\x20", -1, 0, FALSE },
-  { "\xf4\x20", -1, 0, FALSE },
-  { "\xf5\x20", -1, 0, FALSE },
-  { "\xf6\x20", -1, 0, FALSE },
-  { "\xf7\x20", -1, 0, FALSE },
-  { "\xf8\x20", -1, 0, FALSE },
-  { "\xf9\x20", -1, 0, FALSE },
-  { "\xfa\x20", -1, 0, FALSE },
-  { "\xfb\x20", -1, 0, FALSE },
-  { "\xfc\x20", -1, 0, FALSE },
-  { "\xfd\x20", -1, 0, FALSE },
-  /* missing continuation bytes */
-  { "\x20\xc0", -1, 1, FALSE },
-  { "\x20\xe0\x80", -1, 1, FALSE },
-  { "\x20\xf0\x80\x80", -1, 1, FALSE },
-  { "\x20\xf8\x80\x80\x80", -1, 1, FALSE },
-  { "\x20\xfc\x80\x80\x80\x80", -1, 1, FALSE },
-  { "\x20\xdf", -1, 1, FALSE },
-  { "\x20\xef\xbf", -1, 1, FALSE },
-  { "\x20\xf7\xbf\xbf", -1, 1, FALSE },
-  { "\x20\xfb\xbf\xbf\xbf", -1, 1, FALSE },
-  { "\x20\xfd\xbf\xbf\xbf\xbf", -1, 1, FALSE },
-  /* impossible bytes */
-  { "\x20\xfe\x20", -1, 1, FALSE },
-  { "\x20\xff\x20", -1, 1, FALSE },
-  /* overlong sequences */
-  { "\x20\xc0\xaf\x20", -1, 1, FALSE },
-  { "\x20\xe0\x80\xaf\x20", -1, 1, FALSE },
-  { "\x20\xf0\x80\x80\xaf\x20", -1, 1, FALSE },
-  { "\x20\xf8\x80\x80\x80\xaf\x20", -1, 1, FALSE },
-  { "\x20\xfc\x80\x80\x80\x80\xaf\x20", -1, 1, FALSE },
-  { "\x20\xc1\xbf\x20", -1, 1, FALSE },
-  { "\x20\xe0\x9f\xbf\x20", -1, 1, FALSE },
-  { "\x20\xf0\x8f\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xf8\x87\xbf\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xfc\x83\xbf\xbf\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xc0\x80\x20", -1, 1, FALSE },
-  { "\x20\xe0\x80\x80\x20", -1, 1, FALSE },
-  { "\x20\xf0\x80\x80\x80\x20", -1, 1, FALSE },
-  { "\x20\xf8\x80\x80\x80\x80\x20", -1, 1, FALSE },
-  { "\x20\xfc\x80\x80\x80\x80\x80\x20", -1, 1, FALSE },
-  /* illegal code positions */
-  { "\x20\xed\xa0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xad\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xae\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xaf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xb0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xbe\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xa0\x80\xed\xb0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xa0\x80\xed\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xad\xbf\xed\xb0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xad\xbf\xed\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xae\x80\xed\xb0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xae\x80\xed\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xed\xaf\xbf\xed\xb0\x80\x20", -1, 1, FALSE },
-  { "\x20\xed\xaf\xbf\xed\xbf\xbf\x20", -1, 1, FALSE },
-  { "\x20\xef\xbf\xbe\x20", -1, 1, FALSE },
-  { "\x20\xef\xbf\xbf\x20", -1, 1, FALSE },
-
-  { NULL, }
-};
-
-static void 
-do_test (gint         index,
-	 const gchar *text, 
-	 gint         max_len,
-	 gint         offset,
-	 gboolean     valid)
-{
-  const gchar *end;
-  gboolean result;
-  
-  result = g_utf8_validate (text, max_len, &end);
-
-  if (result != valid || end - text != offset)
-    {
-      GString *str;
-      const gchar *p;
-
-      any_failed = TRUE;
-      
-      str = g_string_new (0);
-      for (p = text; *p; p++)
-	g_string_append_printf (str, "\\x%02hhx", *p);
-      g_print ("%d: g_utf8_validate (\"%s\", %d) failed, "
-	       "expected %s %d, got %s %d\n",
-	       index,
-	       str->str, max_len, 
-	       valid ? "TRUE" : "FALSE", offset,
-	       result ? "TRUE" : "FALSE", (gint) (end - text));
-      g_string_free (str, FALSE);
-    }
-}
-
-int
-main (int argc, char *argv[])
-{
-  gint i;
-
-  for (i = 0; test[i].text; i++)
-    do_test (i, test[i].text, test[i].max_len, 
-	     test[i].offset, test[i].valid);
-
-  return any_failed ? 1 : 0;
-}