Changeset 2029

Timestamp:

05/22/07 01:24:25

Author:

pvanhoof

Message:

Unit test fixes

Files:

• trunk/configure.ac (modified) (4 diffs)
• trunk/libtinymail-test/check_libtinymailui_main.c (modified) (1 diff)
• trunk/libtinymail-test/tny-folder-store-test.c (modified) (4 diffs)
• trunk/libtinymail-test/tny-folder-test.c (modified) (10 diffs)
• trunk/libtinymail-test/tny-header-test.c (modified) (1 diff)
• trunk/libtinymail-test/tny-list-test.c (modified) (1 diff)

trunk/configure.ac

@@ -181 +181 @@
-  [Build using acap features]),
-[case "${enableval}" in
-
-
-
+
-  no)  build_acap=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-acap) ;;
@@ -194 +192 @@
-  [Build using queues]),
-[case "${enableval}" in
-
-
-
+
-  no)  build_queues=false ;;
-  *) AC_MSG_ERROR(bad value ${enableval} for --enable-queues) ;;
@@ -307 +303 @@
- fi
-fi
-
-
-dnl ### libtinymailui, the ui abstraction library ##
@@ -345 +340 @@
-dnl ### libtinymailui-mozembed, a library that wraps the gtkmozembed widget ##
-if test x$build_mozembed = xtrue; then
+
-  AC_TNY_MOZ_CHECK
+
+  if test x$mozilla_nspr = xno; then
+    AC_MSG_ERROR("You need Mozilla's NSPR") 
+  fi
+  if test x$mozilla_nss = xno; then
+    AC_MSG_ERROR("You need Mozilla's NSS")
+  fi
+  if test x$mozilla_xpcom = xno; then
+    AC_MSG_ERROR("You need Mozilla's XPCOM")
+  fi
+  if test x$mozilla_gtkmozembed = xno; then
+   AC_MSG_ERROR("You need Mozilla's GtkMozEmbed")
+  fi
+
-  extraplatpkgs="$mozilla_nspr $mozilla_nss $mozilla_xpcom $mozilla_gtkmozembed"
-  extratnypkgs="$extratnypkgs $extraplatpkgs"

trunk/libtinymail-test/check_libtinymailui_main.c

@@ -2 +2 @@
-
-#include "check_libtinymailui.h"
+
+#include <gtk/gtk.h>
-
-int

trunk/libtinymail-test/tny-folder-store-test.c

@@ -19 +19 @@
-#include "check_libtinymail.h"
-
+#include <gtk/gtk.h>
+
-#include <tny-folder.h>
-#include <tny-camel-folder.h>
@@ -102 +104 @@
-}
-
+static void status_cb (GObject *self, TnyStatus *status, gpointer user_data) {}
+
-START_TEST (tny_folder_store_test_get_folders_async)
-{
@@ -113 +117 @@
-
-     folders = tny_simple_list_new ();
-
+status_cb, 
-     g_timeout_add (1000*4, timeout, NULL);
-     gtk_main ();
@@ -148 +152 @@
-     TnyFolder *new_folder;
-     const gchar *new_folder_name = "tny-folder-store-test_temp-folder";
-     gchar *str;
-
-     /* Make sure errors are set - cannot add folder to root */

trunk/libtinymail-test/tny-folder-test.c

@@ -19 +19 @@
-#include "check_libtinymail.h"
-
+#include <gtk/gtk.h>
+
-#include <tny-folder.h>
-#include <tny-camel-folder.h>
@@ -38 +40 @@
-static GError *err;
-
+
-typedef void (*performer) (TnyFolder *folder);
+
+static void status_cb (GObject *self, TnyStatus *status, gpointer user_data) {}
-
-static void
@@ -159 +164 @@
-
-static void
-
+gboolean cancelled, 
-{
-        fail_unless (*err == NULL, "Error receiving message async");
@@ -174 +179 @@
-        TnyHeader *header;
-        TnyMsg *msg;
-
-
+
-        if (iface == NULL)
-        {
@@ -206 +210 @@
-        callback_completed = FALSE;
-        err = NULL;
-
+status_cb, 
-        g_timeout_add (1000*6, timeout, NULL);
-        gtk_main ();
@@ -265 +269 @@
-START_TEST (tny_folder_test_properties)
-{
-        gint count;
-
-        if (iface == NULL)
-        {
@@ -289 +291 @@
-END_TEST
-
-START_TEST (tny_folder_test_name)
-{
-        const gchar *name = "tny-folder-iface-test";
-        const gchar *temp_name = "tny-folder-iface-test_temp";
-
-        if (iface == NULL)
-        {
-                g_warning ("Test cannot continue (are you online?)");
-                return;
-        }
-
-        fail_unless (strcmp (tny_folder_get_name (iface), name) == 0, "Folder had wrong name property");
-        err = NULL;
-        tny_folder_set_name (iface, temp_name, &err);
-        fail_unless (err == NULL, "An error occured while renaming folder");
-        fail_unless (strcmp (tny_folder_get_name (iface), temp_name) == 0, "Folder had wrong name property");
-        err = NULL;
-        tny_folder_set_name (iface, name, &err);
-        fail_unless (err == NULL, "An error occured while renaming folder");
-        fail_unless (strcmp (tny_folder_get_name (iface), name) == 0, "Folder had wrong name property");
-}
-END_TEST
-
-START_TEST (tny_folder_test_subscribed)
-{
-        TnyFolder *folder;
-
-        fail_unless (tny_folder_is_subscribed (iface), "Subscription property should be set");
-        recurse_folders (TNY_FOLDER_STORE (account), NULL, "INBOX/unsubscribed_folder", second_folder);
@@ -337 +314 @@
-END_TEST
-
-static void
-refresh_progress (TnyFolder *folder, const gchar *what, gint status, gint oftotal, gpointer user_data)
-{
-        g_print (".");
-}
-
-static void
@@ -363 +335 @@
-        g_print ("Refreshing folder..");
-        callback_completed = FALSE;
-refresh_progress
+status_cb
-        g_timeout_add (1000*6, timeout, NULL);
-        gtk_main ();
@@ -394 +366 @@
-        suite_add_tcase (s, tc);
-
-        tc = tcase_create ("Name");
-        tcase_set_timeout (tc, 15);
-        tcase_add_checked_fixture (tc, tny_folder_test_setup, tny_folder_test_teardown);
-        tcase_add_test (tc, tny_folder_test_name);
-        suite_add_tcase (s, tc);
-
-        tc = tcase_create ("Subscribed");
-        tcase_add_checked_fixture (tc, tny_folder_test_setup, tny_folder_test_teardown);

trunk/libtinymail-test/tny-header-test.c

@@ -21 +21 @@
-#include <tny-msg.h>
-#include <tny-header.h>
+
+#include <tny-camel-msg.h>
+
-#include <camel/camel-folder.h>
-#include <camel/camel.h>

trunk/libtinymail-test/tny-list-test.c

@@ -203 +203 @@
-
-        item = tny_iterator_get_current (iterator);
-
+%s 
-        fail_unless (item == c, str);
-        g_free (str);