libsocialweb: Fix the tests to work with libsocialweb 0.25.20

This bumps our libsocialweb dependency to 0.25.20 since that's the first
release to include the s/com.meego/org.gnome/ D-Bus path change.

diff --git a/configure.ac b/configure.ac
index 012fe5b..515ab34 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -101,7 +101,7 @@ fi
 AM_CONDITIONAL([ENABLE_EDS], [test "x$enable_eds_backend" = "xyes"])
 
 # Automatically check the dependencies for the libsocialweb backend
-SW_CLIENT_REQUIRED=0.25.15
+SW_CLIENT_REQUIRED=0.25.20
 AC_ARG_ENABLE(libsocialweb-backend,
         AC_HELP_STRING([--enable-libsocialweb-backend=@<:@no/yes/auto@:>@],
                        [build the Libsocialweb backend (default: auto)]),

diff --git a/tests/lib/libsocialweb/backend.vala b/tests/lib/libsocialweb/backend.vala
index 434798d..da1c805 100644 (file)
--- a/tests/lib/libsocialweb/backend.vala
+++ b/tests/lib/libsocialweb/backend.vala
@@ -21,7 +21,7 @@
 using Gee;
 using GLib;
 
-[DBus (name = "com.meego.libsocialweb.ContactView")]
+[DBus (name = "org.gnome.libsocialweb.ContactView")]
 public interface LibsocialwebTest.ContactView : DBusProxy
 {
   public struct ContactsAddedElement
@@ -52,7 +52,7 @@ public interface LibsocialwebTest.ContactView : DBusProxy
   public signal void ContactsRemoved (ContactsRemovedElement[] contacts);
 }
 
-[DBus (name = "com.meego.libsocialweb.ContactView")]
+[DBus (name = "org.gnome.libsocialweb.ContactView")]
 public class LibsocialwebTest.LibsocialwebContactViewTest : Object
 {
   public struct ContactsAddedElement
@@ -182,14 +182,14 @@ public class LibsocialwebTest.LibsocialwebContactViewTest : Object
     }
 }
 
-[DBus (name = "com.meego.libsocialweb.Service")]
+[DBus (name = "org.gnome.libsocialweb.Service")]
 public interface LibsocialwebTest.LibsocialwebServiceCapabilitiesTest : Object
 {
   [DBus (name = "GetStaticCapabilities")]
   public abstract string[] GetStaticCapabilities () throws GLib.IOError;
 }
 
-[DBus (name = "com.meego.libsocialweb.ContactsQuery")]
+[DBus (name = "org.gnome.libsocialweb.ContactsQuery")]
 public interface LibsocialwebTest.LibsocialwebServiceQueryTest : Object
 {
   [DBus (name = "OpenView")]
@@ -197,7 +197,7 @@ public interface LibsocialwebTest.LibsocialwebServiceQueryTest : Object
       HashTable<string, string> p) throws GLib.IOError;
 }
 
-[DBus (name = "com.meego.libsocialweb.ContactsQuery")]
+[DBus (name = "org.gnome.libsocialweb.ContactsQuery")]
 public class LibsocialwebTest.LibsocialwebServiceTest : Object,
     LibsocialwebTest.LibsocialwebServiceCapabilitiesTest,
     LibsocialwebTest.LibsocialwebServiceQueryTest
@@ -248,7 +248,7 @@ public class LibsocialwebTest.LibsocialwebServiceTest : Object,
     }
 }
 
-[DBus (name = "com.meego.libsocialweb")]
+[DBus (name = "org.gnome.libsocialweb")]
 public class LibsocialwebTest.LibsocialwebServerTest : Object
 {
   private string[] services;
@@ -298,9 +298,9 @@ public class LibsocialwebTest.LibsocialwebServerTest : Object
 
 public class LibsocialwebTest.Backend
 {
-  public static const string LIBSOCIALWEB_IFACE = "com.meego.libsocialweb";
-  public static const string LIBSOCIALWEB_PATH = "/com/meego/libsocialweb";
-  public static const string LIBSOCIALWEB_BUS_NAME = "com.meego.libsocialweb";
+  public static const string LIBSOCIALWEB_IFACE = "org.gnome.libsocialweb";
+  public static const string LIBSOCIALWEB_PATH = "/org/gnome/libsocialweb";
+  public static const string LIBSOCIALWEB_BUS_NAME = "org.gnome.libsocialweb";
 
   public bool debug { get; set; }
   private LibsocialwebServerTest lsw_server;

diff --git a/tests/libsocialweb/aggregation.vala b/tests/libsocialweb/aggregation.vala
index d2549b6..f06fb22 100644 (file)
--- a/tests/libsocialweb/aggregation.vala
+++ b/tests/libsocialweb/aggregation.vala
@@ -129,7 +129,7 @@ public class AggregationTests : Folks.TestCase
                     {
                       var conn = Bus.get_sync (BusType.SESSION);
                       conn.emit_signal (null, path,
-                          "com.meego.libsocialweb.ContactView",
+                          "org.gnome.libsocialweb.ContactView",
                           "ContactsAdded", v);
                     }
                   catch (GLib.IOError e)
@@ -159,7 +159,7 @@ public class AggregationTests : Folks.TestCase
                     {
                       var conn = Bus.get_sync (BusType.SESSION);
                       conn.emit_signal (null, path,
-                          "com.meego.libsocialweb.ContactView",
+                          "org.gnome.libsocialweb.ContactView",
                           "ContactsAdded", v);
                     }
                   catch (GLib.IOError e)

diff --git a/tests/libsocialweb/dummy-lsw.vala b/tests/libsocialweb/dummy-lsw.vala
index 1734b54..d2a9241 100644 (file)
--- a/tests/libsocialweb/dummy-lsw.vala
+++ b/tests/libsocialweb/dummy-lsw.vala
@@ -70,7 +70,7 @@ public class DummyLswTests : Folks.TestCase
           var conn = Bus.get_sync (BusType.SESSION);
           conn.get_proxy<LibsocialwebTest.ContactView>
               .begin<LibsocialwebTest.ContactView> (
-              "com.meego.libsocialweb", view_path, 0, null, (v) =>
+              "org.gnome.libsocialweb", view_path, 0, null, (v) =>
             {
               LibsocialwebTest.ContactView view
                   = (LibsocialwebTest.ContactView)v;
@@ -119,7 +119,7 @@ public class DummyLswTests : Folks.TestCase
                     {
                       var conn = Bus.get_sync (BusType.SESSION);
                       conn.emit_signal (null, path,
-                          "com.meego.libsocialweb.ContactView",
+                          "org.gnome.libsocialweb.ContactView",
                           "ContactsAdded", v);
                     }
                   catch (GLib.IOError e)
@@ -210,7 +210,7 @@ public class DummyLswTests : Folks.TestCase
             {
               var conn = Bus.get_sync (BusType.SESSION);
               conn.emit_signal (null, view_path,
-                  "com.meego.libsocialweb.ContactView",
+                  "org.gnome.libsocialweb.ContactView",
                   "ContactsChanged", v);
             }
           catch (GLib.IOError e)
@@ -253,7 +253,7 @@ public class DummyLswTests : Folks.TestCase
             {
               var conn = Bus.get_sync (BusType.SESSION);
               conn.emit_signal (null, view_path,
-                  "com.meego.libsocialweb.ContactView",
+                  "org.gnome.libsocialweb.ContactView",
                   "ContactsRemoved", v);
             }
           catch (GLib.IOError e)