empathy r1553 - trunk/tests

[xclaesse svn gnome org]

Author: xclaesse
Date: Mon Oct 13 07:54:23 2008
New Revision: 1553
URL: http://svn.gnome.org/viewvc/empathy?rev=1553&view=rev

Log:
move empathy specifc helpers to check-empathy-helpers

Added:
   trunk/tests/check-empathy-helpers.c
      - copied, changed from r1552, /trunk/tests/check-helpers.c
   trunk/tests/check-empathy-helpers.h
      - copied, changed from r1552, /trunk/tests/check-helpers.h
Modified:
   trunk/tests/Makefile.am
   trunk/tests/check-empathy-chatroom-manager.c
   trunk/tests/check-empathy-irc-network-manager.c
   trunk/tests/check-helpers.c
   trunk/tests/check-helpers.h

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Mon Oct 13 07:54:23 2008
@@ -33,6 +33,8 @@
     check-helpers.h                              \
     check-libempathy.h                           \
     check-empathy-utils.c                        \
+    check-empathy-helpers.h                      \
+    check-empathy-helpers.c                      \
     check-irc-helper.h                           \
     check-irc-helper.c                           \
     check-empathy-irc-server.c                   \

Modified: trunk/tests/check-empathy-chatroom-manager.c
==============================================================================
--- trunk/tests/check-empathy-chatroom-manager.c	(original)
+++ trunk/tests/check-empathy-chatroom-manager.c	Mon Oct 13 07:54:23 2008
@@ -3,9 +3,12 @@
 #include <string.h>
 #include <glib/gstdio.h>
 
+#include <gconf/gconf.h>
+#include <gconf/gconf-client.h>
 #include <check.h>
 #include "check-helpers.h"
 #include "check-libempathy.h"
+#include "check-empathy-helpers.h"
 
 #include <libempathy/empathy-chatroom-manager.h>
 

Copied: trunk/tests/check-empathy-helpers.c (from r1552, /trunk/tests/check-helpers.c)
==============================================================================
--- /trunk/tests/check-helpers.c	(original)
+++ trunk/tests/check-empathy-helpers.c	Mon Oct 13 07:54:23 2008
@@ -1,5 +1,5 @@
 /*
- * check-helpers.c - Source for some check helpers
+ * check-empathy-helpers.c - Source for some check helpers
  * Copyright (C) 2007-2008 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -25,46 +25,7 @@
 #include <gconf/gconf-client.h>
 
 #include "check-helpers.h"
-
-static gboolean expecting_critical = FALSE;
-static gboolean received_critical  = FALSE;
-
-static void
-check_helper_log_critical_func (const gchar *log_damain,
-                                GLogLevelFlags log_level,
-                                const gchar *message,
-                                gpointer user_data)
-{
-
-  if (!expecting_critical)
-    {
-      fail("Unexpected critical message: %s\n", message);
-    }
-
-  g_assert (log_level & G_LOG_LEVEL_CRITICAL);
-
-  received_critical = TRUE;
-}
-
-gboolean
-got_critical (void)
-{
-  return received_critical;
-}
-
-void
-expect_critical (gboolean expected)
-{
-  expecting_critical = expected;
-  received_critical = FALSE;
-}
-
-void
-check_helpers_init (void)
-{
-  g_log_set_handler (NULL, G_LOG_LEVEL_CRITICAL,
-      check_helper_log_critical_func, NULL);
-}
+#include "check-empathy-helpers.h"
 
 gchar *
 get_xml_file (const gchar *filename)

Copied: trunk/tests/check-empathy-helpers.h (from r1552, /trunk/tests/check-helpers.h)
==============================================================================
--- /trunk/tests/check-helpers.h	(original)
+++ trunk/tests/check-empathy-helpers.h	Mon Oct 13 07:54:23 2008
@@ -1,5 +1,5 @@
 /*
- * check-helpers.c - Source for some check helpers
+ * check-empathy-helpers.c - Source for some check helpers
  * Copyright (C) 2007 Collabora Ltd.
  *
  * This library is free software; you can redistribute it and/or
@@ -16,35 +16,15 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#ifndef __CHECK_HELPERS_H__
-#define __CHECK_HELPERS_H__
+#ifndef __CHECK_EMPATHY_HELPERS_H__
+#define __CHECK_EMPATHY_HELPERS_H__
 
 #include <glib.h>
-#include <check.h>
 #include <libmissioncontrol/mc-account.h>
 
-void
-check_helpers_init (void);
-
-void
-expect_critical (gboolean expected);
-
-gboolean
-got_critical (void);
-
-#define fail_unless_critical(expr, ...)                          \
-G_STMT_START {                                                    \
-  expect_critical (TRUE);                                         \
-  expr;                                                           \
-  _fail_unless (got_critical (), __FILE__, __LINE__,              \
-      "Expected g_critical, got none", ## __VA_ARGS__, NULL);     \
-  expect_critical (FALSE);                                        \
-} G_STMT_END;
-
 gchar * get_xml_file (const gchar *filename);
 gchar * get_user_xml_file (const gchar *filename);
 void copy_xml_file (const gchar *orig, const gchar *dest);
 void remove_account_from_gconf (McAccount *account);
 
-
-#endif /* #ifndef __CHECK_HELPERS_H__ */
+#endif /* #ifndef __CHECK_EMPATHY_HELPERS_H__ */

Modified: trunk/tests/check-empathy-irc-network-manager.c
==============================================================================
--- trunk/tests/check-empathy-irc-network-manager.c	(original)
+++ trunk/tests/check-empathy-irc-network-manager.c	Mon Oct 13 07:54:23 2008
@@ -7,6 +7,7 @@
 #include "check-helpers.h"
 #include "check-libempathy.h"
 #include "check-irc-helper.h"
+#include "check-empathy-helpers.h"
 
 #include <libempathy/empathy-irc-network-manager.h>
 

Modified: trunk/tests/check-helpers.c
==============================================================================
--- trunk/tests/check-helpers.c	(original)
+++ trunk/tests/check-helpers.c	Mon Oct 13 07:54:23 2008
@@ -65,99 +65,3 @@
   g_log_set_handler (NULL, G_LOG_LEVEL_CRITICAL,
       check_helper_log_critical_func, NULL);
 }
-
-gchar *
-get_xml_file (const gchar *filename)
-{
-  return g_build_filename (g_getenv ("EMPATHY_SRCDIR"), "tests", "xml",
-      filename, NULL);
-}
-
-gchar *
-get_user_xml_file (const gchar *filename)
-{
-  return g_build_filename (g_get_tmp_dir (), filename, NULL);
-}
-
-void
-copy_xml_file (const gchar *orig,
-               const gchar *dest)
-{
-  gboolean result;
-  gchar *buffer;
-  gsize length;
-  gchar *sample;
-  gchar *file;
-
-  sample = get_xml_file (orig);
-  result = g_file_get_contents (sample, &buffer, &length, NULL);
-  fail_if (!result);
-
-  file = get_user_xml_file (dest);
-  result = g_file_set_contents (file, buffer, length, NULL);
-  fail_if (!result);
-
-  g_free (sample);
-  g_free (file);
-  g_free (buffer);
-}
-
-void
-remove_account_from_gconf (McAccount *account)
-{
-  GConfClient *client;
-  gchar *path;
-  GError *error = NULL;
-  GSList *entries = NULL, *l;
-
-  client = gconf_client_get_default ();
-  path = g_strdup_printf ("/apps/telepathy/mc/accounts/%s",
-      mc_account_get_unique_name (account));
-
-  entries = gconf_client_all_entries (client, path, &error);
-  if (error != NULL)
-    {
-      g_print ("failed to list entries in %s: %s\n", path, error->message);
-      g_error_free (error);
-      error = NULL;
-    }
-
-  for (l = entries; l != NULL; l = g_slist_next (l))
-    {
-      GConfEntry *entry = l->data;
-
-      if (g_str_has_suffix (entry->key, "data_dir"))
-        {
-          gchar *dir;
-
-          dir = gconf_client_get_string (client, entry->key, &error);
-          if (error != NULL)
-            {
-              g_print ("get data_dir string failed: %s\n", entry->key);
-              g_error_free (error);
-              error = NULL;
-            }
-          else
-            {
-              if (g_rmdir (dir) != 0)
-                g_print ("can't remove %s\n", dir);
-            }
-        }
-
-      /* FIXME: this doesn't remove the key */
-      gconf_client_unset (client, entry->key, &error);
-      if (error != NULL)
-        {
-          g_print ("unset of %s failed: %s\n", path, error->message);
-          g_error_free (error);
-          error = NULL;
-        }
-
-      gconf_entry_free (entry);
-    }
-
-  g_slist_free (entries);
-
-  g_object_unref (client);
-  g_free (path);
-}

Modified: trunk/tests/check-helpers.h
==============================================================================
--- trunk/tests/check-helpers.h	(original)
+++ trunk/tests/check-helpers.h	Mon Oct 13 07:54:23 2008
@@ -41,10 +41,4 @@
   expect_critical (FALSE);                                        \
 } G_STMT_END;
 
-gchar * get_xml_file (const gchar *filename);
-gchar * get_user_xml_file (const gchar *filename);
-void copy_xml_file (const gchar *orig, const gchar *dest);
-void remove_account_from_gconf (McAccount *account);
-
-
 #endif /* #ifndef __CHECK_HELPERS_H__ */