New function which works like g_completion_complete(), but strips a

Thu Feb  5 00:56:28 2004  Matthias Clasen  <maclas@gmx.de>

	* glib/gcompletion.c (g_completion_complete_utf8): New function which
	works like g_completion_complete(), but strips a trailing incomplete
	UTF-8 character from the prefix.  (#133313, Theppitak Karoonboonyanan)

	* tests/completion-test.c (main): Some GCompletion tests.

	* tests/Makefile.am: Add completion-test.

2 files changed, 62 insertions, 0 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3eb2710c5..2357d90ff 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -66,6 +66,7 @@ endif
 test_programs =					\
 	array-test				\
 	$(CXX_TEST)				\
+	completion-test				\
 	date-test				\
 	dirname-test				\
 	file-test				\
@@ -114,6 +115,7 @@ thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
 module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 array_test_LDADD = $(progs_ldadd)
+completion_test_LDADD = $(progs_ldadd)
 date_test_LDADD = $(progs_ldadd)
 dirname_test_LDADD = $(progs_ldadd)
 file_test_LDADD = $(progs_ldadd)
diff --git a/tests/completion-test.c b/tests/completion-test.c
new file mode 100644
index 000000000..880536645
--- /dev/null
+++ b/tests/completion-test.c
@@ -0,0 +1,60 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * 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.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+#include <glib.h>
+
+int main (int argc, char *argv[])
+{
+  GCompletion *cmp;
+  GList *items;
+  gchar *prefix;
+  
+  cmp = g_completion_new (NULL);
+
+  items = NULL;
+  items = g_list_append (items, "a\302\243");
+  items = g_list_append (items, "a\302\244");
+  items = g_list_append (items, "bb");
+  items = g_list_append (items, "bc");
+  g_completion_add_items (cmp, items);
+
+  items = g_completion_complete (cmp, "a", &prefix);
+  g_assert (!strcmp ("a\302", prefix));
+  g_free (prefix);
+  
+  items = g_completion_complete_utf8 (cmp, "a", &prefix);
+  g_assert (!strcmp ("a", prefix));
+  g_free (prefix);
+
+  items = g_completion_complete (cmp, "b", &prefix);
+  g_assert (!strcmp ("b", prefix));
+  g_free (prefix);
+  
+  items = g_completion_complete_utf8 (cmp, "b", &prefix);
+  g_assert (!strcmp ("b", prefix));
+  g_free (prefix);
+
+  return 0;
+}