Move another test

svn path=/trunk/; revision=7209

3 files changed, 53 insertions, 20 deletions

diff --git a/glib/tests/Makefile.am b/glib/tests/Makefile.am
index b602fe7a5..315cbb308 100644
--- a/glib/tests/Makefile.am
+++ b/glib/tests/Makefile.am
@@ -14,8 +14,12 @@ TEST_PROGS       	 += option-context
 option_context_SOURCES	  = option-context.c
 option_context_LDADD	  = $(progs_ldadd)
 
+TEST_PROGS     	 += keyfile
+keyfile_SOURCES	  = keyfile.c
+keyfile_LDADD	  = $(progs_ldadd)
+
 TEST_PROGS        += fileutils
-fileutils_SOURCES   = fileutils.c
+fileutils_SOURCES  = fileutils.c
 fileutils_LDADD	   = $(progs_ldadd)
 
 TEST_PROGS        += strfuncs
@@ -25,6 +29,9 @@ strfuncs_LDADD	   = $(progs_ldadd) -lm
 TEST_PROGS               += markup-subparser
 markup_subparser_LDADD    = $(progs_ldadd)
 
+TEST_PROGS         += array-test
+array_test_LDADD    = $(progs_ldadd)
+
 # some testing of gtester funcitonality
 XMLLINT=xmllint
 gtester-xmllint-check: # check testreport xml with xmllint if present
diff --git a/tests/array-test.c b/glib/tests/array-test.c
index 3777667dc..6f83a2762 100644
--- a/tests/array-test.c
+++ b/glib/tests/array-test.c
@@ -40,52 +40,64 @@ sum_up (gpointer data,
   *sum += GPOINTER_TO_INT (data);
 }
 
-int
-main (int   argc,
-      char *argv[])
+static void
+array_append (void)
 {
-  gint i;
   GArray *garray;
-  GPtrArray *gparray;
-  GByteArray *gbarray;
-  gint sum = 0;
+  gint i;
 
-  /* array tests */
   garray = g_array_new (FALSE, FALSE, sizeof (gint));
   for (i = 0; i < 10000; i++)
     g_array_append_val (garray, i);
 
   for (i = 0; i < 10000; i++)
-    g_assert (g_array_index (garray, gint, i) == i);
+    g_assert_cmpint (g_array_index (garray, gint, i), ==, i);
 
   g_array_free (garray, TRUE);
+}
+
+static void
+array_prepend (void)
+{
+  GArray *garray;
+  gint i;
 
   garray = g_array_new (FALSE, FALSE, sizeof (gint));
   for (i = 0; i < 100; i++)
     g_array_prepend_val (garray, i);
 
   for (i = 0; i < 100; i++)
-    g_assert (g_array_index (garray, gint, i) == (100 - i - 1));
+    g_assert_cmpint (g_array_index (garray, gint, i), ==, (100 - i - 1));
 
   g_array_free (garray, TRUE);
+}
+
+static void
+pointer_array_add (void)
+{
+  GPtrArray *gparray;
+  gint i;
+  gint sum = 0;
 
-  /* pointer arrays */
   gparray = g_ptr_array_new ();
   for (i = 0; i < 10000; i++)
     g_ptr_array_add (gparray, GINT_TO_POINTER (i));
 
   for (i = 0; i < 10000; i++)
-    if (g_ptr_array_index (gparray, i) != GINT_TO_POINTER (i))
-      g_print ("array fails: %p ( %p )\n",
-	       g_ptr_array_index (gparray, i),
-	       GINT_TO_POINTER (i));
+    g_assert (g_ptr_array_index (gparray, i) == GINT_TO_POINTER (i));
   
   g_ptr_array_foreach (gparray, sum_up, &sum);
   g_assert (sum == 49995000);
 
   g_ptr_array_free (gparray, TRUE);
+}
+
+static void
+byte_array_append (void)
+{
+  GByteArray *gbarray;
+  gint i;
 
-  /* byte arrays */
   gbarray = g_byte_array_new ();
   for (i = 0; i < 10000; i++)
     g_byte_array_append (gbarray, (guint8*) "abcd", 4);
@@ -99,7 +111,23 @@ main (int   argc,
     }
 
   g_byte_array_free (gbarray, TRUE);
+}
+
+int
+main (int argc, char *argv[])
+{
+  g_test_init (&argc, &argv, NULL);
+
+  /* array tests */
+  g_test_add_func ("/array/append", array_append);
+  g_test_add_func ("/array/prepend", array_prepend);
+
+  /* pointer arrays */
+  g_test_add_func ("/pointerarray/add", pointer_array_add);
+
+  /* byte arrays */
+  g_test_add_func ("/bytearray/append", byte_array_append);
 
-  return 0;
+  return g_test_run ();
 }
 
diff --git a/tests/Makefile.am b/tests/Makefile.am
index f444f5a75..38353f31d 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,6 @@ endif
 
 test_programs =					\
 	atomic-test				\
-	array-test				\
 	base64-test				\
 	bit-test				\
 	$(CXX_TEST)				\
@@ -164,7 +163,6 @@ thread_ldadd = $(libgthread) $(G_THREAD_LIBS) $(progs_ldadd)
 module_ldadd = $(libgmodule) $(G_MODULE_LIBS) $(progs_ldadd)
 
 atomic_test_LDADD = $(progs_ldadd)
-array_test_LDADD = $(progs_ldadd)
 base64_test_LDADD = $(progs_ldadd)
 bit_test_LDADD = $(progs_ldadd)
 bookmarkfile_test_LDADD = $(progs_ldadd)