aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/.gitignore1
-rw-r--r--tests/Makefile.am8
-rw-r--r--tests/check-empathy-helpers.c2
-rw-r--r--tests/contact-run-until-ready-2.c63
-rw-r--r--tests/contact-run-until-ready.c53
-rw-r--r--tests/test-empathy-presence-chooser.c4
-rw-r--r--tests/test-empathy-status-preset-dialog.c49
7 files changed, 58 insertions, 122 deletions
diff --git a/tests/.gitignore b/tests/.gitignore
index 442cafd51..a37f3e5a0 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -5,3 +5,4 @@ contact-run-until-ready-2
*.log
empetit
test-empathy-presence-chooser
+test-empathy-status-preset-dialog
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 67f6ec9af..7740d1f8b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -24,16 +24,14 @@ LDADD = \
noinst_PROGRAMS = \
contact-manager \
- contact-run-until-ready \
- contact-run-until-ready-2 \
empetit \
- test-empathy-presence-chooser
+ test-empathy-presence-chooser \
+ test-empathy-status-preset-dialog
contact_manager_SOURCES = contact-manager.c
-contact_run_until_ready_SOURCES = contact-run-until-ready.c
-contact_run_until_ready_2_SOURCES = contact-run-until-ready-2.c
empetit_SOURCES = empetit.c
test_empathy_presence_chooser_SOURCES = test-empathy-presence-chooser.c
+test_empathy_status_preset_dialog_SOURCES = test-empathy-status-preset-dialog.c
check_PROGRAMS = check-main
TESTS = check-main
diff --git a/tests/check-empathy-helpers.c b/tests/check-empathy-helpers.c
index 2e808c0e7..65273f8c8 100644
--- a/tests/check-empathy-helpers.c
+++ b/tests/check-empathy-helpers.c
@@ -143,7 +143,7 @@ destroy_test_account (McAccount *account)
error = NULL;
}
- gconf_entry_free (entry);
+ gconf_entry_unref (entry);
}
g_slist_free (entries);
diff --git a/tests/contact-run-until-ready-2.c b/tests/contact-run-until-ready-2.c
deleted file mode 100644
index 426534116..000000000
--- a/tests/contact-run-until-ready-2.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#include <stdlib.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libempathy/empathy-contact-factory.h>
-#include <libempathy/empathy-contact-manager.h>
-#include <libmissioncontrol/mc-account.h>
-
-static void
-pending_cb (EmpathyContactManager *manager,
- EmpathyContact *contact,
- EmpathyContact *actor,
- guint reason,
- gchar *message,
- gboolean is_pending,
- gpointer data)
-{
- if (!is_pending) {
- return;
- }
-
- g_print ("Contact handle=%d alias=%s\n",
- empathy_contact_get_handle (contact),
- empathy_contact_get_name (contact));
-
- empathy_contact_run_until_ready (contact,
- EMPATHY_CONTACT_READY_NAME,
- NULL);
-
- g_print ("Contact ready: handle=%d alias=%s ready=%d\n",
- empathy_contact_get_handle (contact),
- empathy_contact_get_name (contact),
- empathy_contact_get_ready (contact));
-
- g_object_unref (manager);
- gtk_main_quit ();
-}
-
-static gboolean
-callback (gpointer data)
-{
- EmpathyContactManager *manager;
-
- manager = empathy_contact_manager_dup_singleton ();
- g_signal_connect (manager, "pendings-changed",
- G_CALLBACK (pending_cb),
- NULL);
-
- return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
- gtk_init (&argc, &argv);
-
- g_idle_add (callback, NULL);
-
- gtk_main ();
-
- return EXIT_SUCCESS;
-}
-
diff --git a/tests/contact-run-until-ready.c b/tests/contact-run-until-ready.c
deleted file mode 100644
index 13fad63a7..000000000
--- a/tests/contact-run-until-ready.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <stdlib.h>
-
-#include <glib.h>
-#include <gtk/gtk.h>
-#include <libempathy/empathy-contact-factory.h>
-#include <libmissioncontrol/mc-account.h>
-
-static gboolean
-callback (gpointer data)
-{
- EmpathyContactFactory *factory;
- McAccount *account;
- EmpathyContact *contact;
- EmpathyContactReady ready_flags;
-
- factory = empathy_contact_factory_dup_singleton ();
- account = mc_account_lookup ("jabber0");
- contact = empathy_contact_factory_get_from_handle (factory, account, 2);
-
- g_print ("Contact handle=%d alias=%s\n",
- empathy_contact_get_handle (contact),
- empathy_contact_get_name (contact));
-
- ready_flags = EMPATHY_CONTACT_READY_HANDLE | EMPATHY_CONTACT_READY_NAME;
- empathy_contact_run_until_ready (contact, ready_flags, NULL);
-
- g_print ("Contact ready: handle=%d alias=%s ready=%d needed-ready=%d\n",
- empathy_contact_get_handle (contact),
- empathy_contact_get_name (contact),
- empathy_contact_get_ready (contact),
- ready_flags);
-
- g_object_unref (factory);
- g_object_unref (account);
- g_object_unref (contact);
-
- gtk_main_quit ();
-
- return FALSE;
-}
-
-int
-main (int argc, char **argv)
-{
- gtk_init (&argc, &argv);
-
- g_idle_add (callback, NULL);
-
- gtk_main ();
-
- return EXIT_SUCCESS;
-}
-
diff --git a/tests/test-empathy-presence-chooser.c b/tests/test-empathy-presence-chooser.c
index 02991e859..12d35b4c6 100644
--- a/tests/test-empathy-presence-chooser.c
+++ b/tests/test-empathy-presence-chooser.c
@@ -24,6 +24,8 @@
#include <gtk/gtk.h>
+#include <libempathy/empathy-status-presets.h>
+
#include <libempathy-gtk/empathy-ui-utils.h>
#include <libempathy-gtk/empathy-presence-chooser.h>
@@ -36,6 +38,8 @@ main (int argc, char **argv)
gtk_init (&argc, &argv);
empathy_gtk_init ();
+ empathy_status_presets_get_all ();
+
window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
chooser = empathy_presence_chooser_new ();
gtk_container_add (GTK_CONTAINER (window), chooser);
diff --git a/tests/test-empathy-status-preset-dialog.c b/tests/test-empathy-status-preset-dialog.c
new file mode 100644
index 000000000..6602e4f28
--- /dev/null
+++ b/tests/test-empathy-status-preset-dialog.c
@@ -0,0 +1,49 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * Copyright (C) 2009 Collabora Ltd.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Davyd Madeley <davyd.madeley@collabora.co.uk>
+ */
+
+#include <config.h>
+
+#include <gtk/gtk.h>
+
+#include <libempathy/empathy-status-presets.h>
+
+#include <libempathy-gtk/empathy-ui-utils.h>
+#include <libempathy-gtk/empathy-status-preset-dialog.h>
+
+int
+main (int argc, char **argv)
+{
+ GtkWidget *dialog;
+
+ gtk_init (&argc, &argv);
+ empathy_gtk_init ();
+
+ empathy_status_presets_get_all ();
+
+ dialog = empathy_status_preset_dialog_new (NULL);
+
+ gtk_widget_show (dialog);
+
+ gtk_main ();
+
+ return 0;
+}