[evolution-data-server/openismus-work-master: 34/37] Fixing up test cases to use the localed service wrapper generated in private/

[Tristan Van Berkom <tvb src gnome org>]

commit 7d53dde182ea9aa4a7fc9e09b7ed77d434f9e8c4
Author: Tristan Van Berkom <tristanvb openismus com>
Date:   Mon May 20 16:18:59 2013 +0900

    Fixing up test cases to use the localed service wrapper generated in private/

 tests/libedata-book/Makefile.am       |   19 +++----------------
 tests/libedata-book/data-test-utils.c |    5 ++---
 tests/libedata-book/data-test-utils.h |    4 ++--
 tests/libedata-book/test-localed.xml  |   15 ---------------
 4 files changed, 7 insertions(+), 36 deletions(-)
---
diff --git a/tests/libedata-book/Makefile.am b/tests/libedata-book/Makefile.am
index 1e2509a..2fadc32 100644
--- a/tests/libedata-book/Makefile.am
+++ b/tests/libedata-book/Makefile.am
@@ -1,23 +1,7 @@
 
-# Test service mimicking the "org.freedesktop.locale1" interface
-#
-GENERATED_TEST_LOCALE_SERVICE = \
-       e-test-localed.c \
-       e-test-localed.h \
-       $(NULL)
-
-$(GENERATED_TEST_LOCALE_SERVICE) : Makefile.am test-localed.xml
-       $(AM_V_GEN) gdbus-codegen \
-       --interface-prefix org.freedesktop. \
-       --c-namespace E_Test \
-       --generate-c-code e-test-localed \
-       $(top_srcdir)/tests/libedata-book/test-localed.xml \
-       $(NULL)
-
 noinst_LTLIBRARIES = libdata-test-utils.la
 
 libdata_test_utils_la_SOURCES =                                        \
-       $(GENERATED_TEST_LOCALE_SERVICE)                        \
        data-test-utils.c                                       \
        data-test-utils.h                                       \
        $(NULL)
@@ -34,6 +18,8 @@ libdata_test_utils_la_CPPFLAGS =                              \
        -I$(top_builddir)/tests/libedataserver                  \
        -I$(top_srcdir)/tests/test-server-utils                 \
        -I$(top_builddir)/tests/test-server-utils               \
+       -I$(top_srcdir)/private                                 \
+       -I$(top_builddir)/private                               \
        -DBACKENDDIR=\"$(ebook_backenddir)\"                    \
        -DDATADIR=\"$(datadir)\"                                \
        -DSRCDIR=\""$(abs_srcdir)"\"                            \
@@ -48,6 +34,7 @@ libdata_test_utils_la_LIBADD =                                \
        $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la  \
        $(top_builddir)/addressbook/libebook/libebook-1.2.la    \
        $(top_builddir)/tests/test-server-utils/libetestserverutils.la  \
+       $(top_builddir)/private/libedbus-private.la             \
        $(EVOLUTION_ADDRESSBOOK_LIBS)                           \
        $(GIO_UNIX_LIBS)                                        \
        $(CAMEL_LIBS)                                           \
diff --git a/tests/libedata-book/data-test-utils.c b/tests/libedata-book/data-test-utils.c
index 4d07c85..2945c91 100644
--- a/tests/libedata-book/data-test-utils.c
+++ b/tests/libedata-book/data-test-utils.c
@@ -202,7 +202,6 @@ e_sqlitedb_cursor_fixture_setup_book (ESource            *scratch,
                                      ETestServerClosure *closure)
 {
        ESourceBackendSummarySetup *setup;
-       EbSdbCursorClosure *data = (EbSdbCursorClosure *)closure;
 
        g_type_class_unref (g_type_class_ref (E_TYPE_SOURCE_BACKEND_SUMMARY_SETUP));
        setup = e_source_get_extension (scratch, E_SOURCE_EXTENSION_BACKEND_SUMMARY_SETUP);
@@ -333,7 +332,7 @@ e_sqlitedb_cursor_fixture_set_locale (EbSdbCursorFixture *fixture,
                        g_error ("Failed to get system bus: %s", error->message);
 
 
-               fixture->locale1 = e_test_locale1_skeleton_new ();
+               fixture->locale1 = e_dbus_locale1_skeleton_new ();
 
                if (!g_dbus_interface_skeleton_export (G_DBUS_INTERFACE_SKELETON (fixture->locale1),
                                                       bus, "/org/freedesktop/locale1", &error))
@@ -343,7 +342,7 @@ e_sqlitedb_cursor_fixture_set_locale (EbSdbCursorFixture *fixture,
 
        /* Send locale change message */
        strv[0] = g_strdup_printf ("LANG=%s", locale);
-       e_test_locale1_set_locale (fixture->locale1, (const gchar * const *)strv);
+       e_dbus_locale1_set_locale (fixture->locale1, (const gchar * const *)strv);
        g_free (strv[0]);
 }
 
diff --git a/tests/libedata-book/data-test-utils.h b/tests/libedata-book/data-test-utils.h
index a9fea89..2f78742 100644
--- a/tests/libedata-book/data-test-utils.h
+++ b/tests/libedata-book/data-test-utils.h
@@ -25,7 +25,7 @@
 #include <libebook/libebook.h>
 #include <libedata-book/libedata-book.h>
 #include "e-test-server-utils.h"
-#include "e-test-localed.h"
+#include "e-dbus-localed.h"
 
 /* This legend shows the add order, and various sort order of the sorted
  * vcards. The UIDs of these contacts are formed as 'sorted-1', 'sorted-2' etc
@@ -83,7 +83,7 @@ typedef struct {
        EContact        *contacts[N_SORTED_CONTACTS];
        EBookQuery      *query;
 
-       ETestLocale1    *locale1;
+       EDBusLocale1    *locale1;
 } EbSdbCursorFixture;
 
 typedef struct {