[folks] tests: Add a missing D-Bus service file for EDS source registry

[Philip Withnall <pwithnall src gnome org>]

commit 1f667e32acff90c32e531cc53fc382e96188ebf9
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Thu Jun 12 08:39:37 2014 +0100

    tests: Add a missing D-Bus service file for EDS source registry
    
    We were missing v2 of the source file, causing the EDS tests to all fail
    with certain versions of EDS.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=731464

 NEWS                         |    1 +
 tests/lib/eds/test-case.vala |   57 ++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 32 deletions(-)
---
diff --git a/NEWS b/NEWS
index 3f4d97d..9511744 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ Bugs fixed:
  • Bug 727944 — crash during Empathy startup: segfault in g_date_time_to_utc
    from _edsf_persona_update
  • Bug 731325 — Fails to build with srcdir != builddir
+ • Bug 731464 — Fail to run EDS tests
 
 API changes:
  • Add Individual.display_name
diff --git a/tests/lib/eds/test-case.vala b/tests/lib/eds/test-case.vala
index 8979b64..5d946c8 100644
--- a/tests/lib/eds/test-case.vala
+++ b/tests/lib/eds/test-case.vala
@@ -98,46 +98,39 @@ public class EdsTest.TestCase : Folks.TestCase
       var libexec = capture_stdout.strip ();
 
       /* Create service files for the Evolution binaries. */
-      var service_file_name =
-          Path.build_filename (this.transient_dir, "dbus-1", "services",
-              "evolution-source-registry.service");
-      var service_file = ("[D-BUS Service]\n" +
-          "Name=org.gnome.evolution.dataserver.Sources3\n" +
-          "Exec=%s/evolution-source-registry\n").printf (libexec);
-
-      try
-        {
-          FileUtils.set_contents (service_file_name, service_file);
-        }
-      catch (FileError e2)
+      const string sources_services[] =
         {
-          error ("Error creating D-Bus service file ‘%s’: %s",
-              service_file_name, e2.message);
-        }
-
-      /* The same for Evolution 3.8. */
-      service_file_name =
-          Path.build_filename (this.transient_dir, "dbus-1", "services",
-              "evolution-source-registry-3-8.service");
-      service_file = ("[D-BUS Service]\n" +
-          "Name=org.gnome.evolution.dataserver.Sources1\n" +
-          "Exec=%s/evolution-source-registry\n").printf (libexec);
+          "org.gnome.evolution.dataserver.Sources3",
+          "org.gnome.evolution.dataserver.Sources2",
+          "org.gnome.evolution.dataserver.Sources1"
+        };
 
-      try
-        {
-          FileUtils.set_contents (service_file_name, service_file);
-        }
-      catch (FileError e2)
+      for (uint i = 0; i < sources_services.length; i++)
         {
-          error ("Error creating D-Bus service file ‘%s’: %s",
-              service_file_name, e2.message);
+          var service_file_name =
+              Path.build_filename (this.transient_dir, "dbus-1", "services",
+                  "evolution-source-registry-%u.service".printf (i));
+          var service_file = ("[D-BUS Service]\n" +
+              "Name=%s\n" +
+              "Exec=%s/evolution-source-registry\n").printf (
+                  sources_services[i], libexec);
+
+          try
+            {
+              FileUtils.set_contents (service_file_name, service_file);
+            }
+          catch (FileError e2)
+            {
+              error ("Error creating D-Bus service file ‘%s’: %s",
+                  service_file_name, e2.message);
+            }
         }
 
       /* Address book factory. */
-      service_file_name =
+      var service_file_name =
           Path.build_filename (this.transient_dir, "dbus-1", "services",
               "evolution-addressbook-factory.service");
-      service_file = ("[D-BUS Service]\n" +
+      var service_file = ("[D-BUS Service]\n" +
           "Name=org.gnome.evolution.dataserver.AddressBook6\n" +
           "Exec=%s/evolution-addressbook-factory\n").printf (libexec);