[folks] Reduce hard-coding of e-d-s address book names

[Simon McVittie <smcv src gnome org>]

commit 6bed8888020653815735c10f8e0a5bc6b7c7467c
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Mar 14 14:40:14 2013 +0000

    Reduce hard-coding of e-d-s address book names
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=695381
    Signed-off-by: Simon McVittie <simon mcvittie collabora co uk>
    Reviewed-by: Philip Withnall <philip tecnocode co uk>

 tests/eds/create-remove-stores.vala      |    4 +++-
 tests/eds/enable-disable-stores.vala     |    4 +++-
 tests/eds/link-personas-diff-stores.vala |    4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)
---
diff --git a/tests/eds/create-remove-stores.vala b/tests/eds/create-remove-stores.vala
index 5a1c4bb..78f3490 100644
--- a/tests/eds/create-remove-stores.vala
+++ b/tests/eds/create-remove-stores.vala
@@ -46,7 +46,9 @@ public class CreateRemoveStoresTests : EdsTest.TestCase
       this._backend_store = BackendStore.dup();
 
       Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
-                                "test:other:test1:test2", true);
+                                (this.eds_backend_address_book_uid +
+                                 ":other:test1:test2"),
+                                true);
     }
 
   public override void tear_down ()
diff --git a/tests/eds/enable-disable-stores.vala b/tests/eds/enable-disable-stores.vala
index 0c8cf24..22ceed7 100644
--- a/tests/eds/enable-disable-stores.vala
+++ b/tests/eds/enable-disable-stores.vala
@@ -51,7 +51,9 @@ public class EnableDisableStoresTests : EdsTest.TestCase
 
       /* We configure eds as the primary store */
       Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
-                                "test:other", true);
+                                (this.eds_backend.address_book_uid + ":" +
+                                 this._eds_backend_other.address_book_uid),
+                                true);
     }
 
   public override void tear_down ()
diff --git a/tests/eds/link-personas-diff-stores.vala b/tests/eds/link-personas-diff-stores.vala
index ba272cd..b67c80f 100644
--- a/tests/eds/link-personas-diff-stores.vala
+++ b/tests/eds/link-personas-diff-stores.vala
@@ -49,7 +49,9 @@ public class LinkPersonasDiffStoresTests : EdsTest.TestCase
       this._eds_backend_other.set_up (false, "other");
 
       Environment.set_variable ("FOLKS_BACKEND_EDS_USE_ADDRESS_BOOKS",
-                                "test:other", true);
+                                (this.eds_backend.address_book_uid + ":" +
+                                 this._eds_backend_other.address_book_uid),
+                                true);
     }
 
   public override void tear_down ()