Move tree tests to the test framework

2 files changed, 0 insertions, 248 deletions

diff --git a/tests/Makefile.am b/tests/Makefile.am
index c4e05b406..0ab35e0c3 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -114,7 +114,6 @@ test_programs =					\
 	$(spawn_test_win32_gui)			\
 	thread-test				\
 	threadpool-test				\
-	tree-test				\
 	type-test				\
 	unicode-caseconv			\
 	unicode-encoding			\
@@ -171,7 +170,6 @@ slice_threadinit_LDADD = $(thread_ldadd)
 spawn_test_LDADD = $(progs_ldadd)
 thread_test_LDADD = $(thread_ldadd)
 threadpool_test_LDADD = $(thread_ldadd)
-tree_test_LDADD = $(progs_ldadd)
 type_test_LDADD = $(progs_ldadd)
 unicode_encoding_LDADD = $(progs_ldadd)
 unicode_caseconv_LDADD = $(progs_ldadd)
diff --git a/tests/tree-test.c b/tests/tree-test.c
deleted file mode 100644
index c5cb105aa..000000000
--- a/tests/tree-test.c
+++ /dev/null
@@ -1,246 +0,0 @@
-/* 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/. 
- */
-
-#undef G_DISABLE_ASSERT
-#undef G_LOG_DOMAIN
-
-#include <stdio.h>
-#include <string.h>
-#include "glib.h"
-
-
-static gint
-my_compare (gconstpointer a,
-	    gconstpointer b)
-{
-  const char *cha = a;
-  const char *chb = b;
-
-  return *cha - *chb;
-}
-
-static gint
-my_search (gconstpointer a,
-	   gconstpointer b)
-{
-  return my_compare (b, a);
-}
-
-static gpointer destroyed_key = NULL;
-static gpointer destroyed_value = NULL;
-
-static void 
-my_key_destroy (gpointer key)
-{
-  destroyed_key = key;
-}
-
-static void 
-my_value_destroy (gpointer value)
-{
-  destroyed_value = value;
-}
-
-static gint
-my_traverse (gpointer key,
-	     gpointer value,
-	     gpointer data)
-{
-  char *ch = key;
-  g_assert ((*ch) > 0);
-  return FALSE;
-}
-
-char chars[] = 
-  "0123456789"
-  "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
-  "abcdefghijklmnopqrstuvwxyz";
-
-char chars2[] = 
-  "0123456789"
-  "abcdefghijklmnopqrstuvwxyz";
-
-static gint
-check_order (gpointer key,
-	     gpointer value,
-	     gpointer data)
-{
-  char **p = data;
-  char *ch = key;
-  
-  g_assert (**p == *ch);
-
-  (*p)++;
-
-  return FALSE;
-}
-
-
-
-int
-main (int   argc,
-      char *argv[])
-{
-  gint i;
-  GTree *tree;
-  gboolean removed;
-  char c, d;
-  char *p;
-
-  tree = g_tree_new (my_compare);
-
-  for (i = 0; chars[i]; i++)
-    g_tree_insert (tree, &chars[i], &chars[i]);
-
-  g_tree_foreach (tree, my_traverse, NULL);
-
-  g_assert (g_tree_nnodes (tree) == strlen (chars));
-  g_assert (g_tree_height (tree) == 6);
-  
-  p = chars;
-  g_tree_foreach (tree, check_order, &p);
-
-  for (i = 0; i < 26; i++)
-    {
-      removed = g_tree_remove (tree, &chars[i + 10]);
-      g_assert (removed);
-    }
-
-  c = '\0';
-  removed = g_tree_remove (tree, &c);
-  g_assert (removed == FALSE);
-
-  g_tree_foreach (tree, my_traverse, NULL);
-
-  g_assert (g_tree_nnodes (tree) == strlen (chars2));
-  g_assert (g_tree_height (tree) == 6);
-
-  p = chars2;
-  g_tree_foreach (tree, check_order, &p);
-
-  for (i = 25; i >= 0; i--)
-    g_tree_insert (tree, &chars[i + 10], &chars[i + 10]);
-
-  p = chars;
-  g_tree_foreach (tree, check_order, &p);
-
-  c = '0';
-  p = g_tree_lookup (tree, &c); 
-  g_assert (p && *p == c);
-
-  c = 'A';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p && *p == c);
-
-  c = 'a';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p && *p == c);
-
-  c = 'z';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p && *p == c);
-
-  c = '!';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p == NULL);
-
-  c = '=';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p == NULL);
-
-  c = '|';
-  p = g_tree_lookup (tree, &c);
-  g_assert (p == NULL);
-
-  c = '0';
-  p = g_tree_search (tree, my_search, &c); 
-  g_assert (p && *p == c);
-
-  c = 'A';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p && *p == c);
-
-  c = 'a';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p &&*p == c);
-
-  c = 'z';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p && *p == c);
-
-  c = '!';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p == NULL);
-
-  c = '=';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p == NULL);
-
-  c = '|';
-  p = g_tree_search (tree, my_search, &c);
-  g_assert (p == NULL);
-
-
-  g_tree_destroy (tree);
-
-  tree = g_tree_new_full ((GCompareDataFunc)my_compare, NULL, 
-			  my_key_destroy, 
-			  my_value_destroy);
-
-  for (i = 0; chars[i]; i++)
-    g_tree_insert (tree, &chars[i], &chars[i]);
-  
-  c = '0';
-  g_tree_insert (tree, &c, &c);
-  g_assert (destroyed_key == &c);
-  g_assert (destroyed_value == &chars[0]);
-  destroyed_key = NULL;
-  destroyed_value = NULL;
-
-  d = '1';
-  g_tree_replace (tree, &d, &d);
-  g_assert (destroyed_key == &chars[1]);
-  g_assert (destroyed_value == &chars[1]);
-  destroyed_key = NULL;
-  destroyed_value = NULL;
-
-  c = '2';
-  removed = g_tree_remove (tree, &c);
-  g_assert (removed);
-  g_assert (destroyed_key == &chars[2]);
-  g_assert (destroyed_value == &chars[2]);
-  destroyed_key = NULL;
-  destroyed_value = NULL;
-
-  c = '3';
-  removed = g_tree_steal (tree, &c);
-  g_assert (removed);
-  g_assert (destroyed_key == NULL);
-  g_assert (destroyed_value == NULL);
-
-  return 0;
-}
-