ft-channel: make Metadata props immutable and test them

Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>

2 files changed, 11 insertions, 1 deletions

diff --git a/src/ft-channel.c b/src/ft-channel.c
index 0c97ad29a..092beb820 100644
--- a/src/ft-channel.c
+++ b/src/ft-channel.c
@@ -328,6 +328,8 @@ gabble_file_transfer_channel_get_property (GObject *object,
               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "TransferredBytes",
               TP_IFACE_CHANNEL_TYPE_FILE_TRANSFER, "InitialOffset",
               GABBLE_IFACE_CHANNEL_TYPE_FILETRANSFER_FUTURE, "FileCollection",
+              GABBLE_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "ServiceName",
+              GABBLE_IFACE_CHANNEL_INTERFACE_FILE_TRANSFER_METADATA, "Metadata",
               NULL);
 
           /* URI is immutable only for outgoing transfers */
diff --git a/tests/twisted/file-transfer/file_transfer_helper.py b/tests/twisted/file-transfer/file_transfer_helper.py
index 2aaf62f34..7bfbbdae5 100644
--- a/tests/twisted/file-transfer/file_transfer_helper.py
+++ b/tests/twisted/file-transfer/file_transfer_helper.py
@@ -332,6 +332,10 @@ class ReceiveFileTest(FileTransferTest):
         assert reason == cs.FT_STATE_CHANGE_REASON_NONE
 
 class SendFileTest(FileTransferTest):
+    service_name = 'a.wacky.service.name'
+    metadata = {'loads': 'of',
+                'mental': 'data'}
+
     def __init__(self, bytestream_cls, file, address_type, access_control, acces_control_param):
         FileTransferTest.__init__(self, bytestream_cls, file, address_type, access_control, acces_control_param)
 
@@ -376,7 +380,9 @@ class SendFileTest(FileTransferTest):
             cs.FT_CONTENT_HASH: self.file.hash,
             cs.FT_DESCRIPTION: self.file.description,
             cs.FT_DATE:  self.file.date,
-            cs.FT_INITIAL_OFFSET: 0 }
+            cs.FT_INITIAL_OFFSET: 0,
+            cs.FT_SERVICE_NAME: self.service_name,
+            cs.FT_METADATA: dbus.Dictionary(self.metadata, signature='ss')}
 
         if uri:
             request[cs.FT_URI] = self.file.uri
@@ -404,6 +410,8 @@ class SendFileTest(FileTransferTest):
         assertEquals(self.file.date, props[cs.FT_DATE])
         assertEquals(0, props[cs.FT_TRANSFERRED_BYTES])
         assertEquals(0, props[cs.FT_INITIAL_OFFSET])
+        assertEquals(self.service_name, props[cs.FT_SERVICE_NAME])
+        assertEquals(self.metadata, props[cs.FT_METADATA])
         if uri:
             assertEquals(self.file.uri, props[cs.FT_URI])
         else: