Messages has been merged into Text

7 files changed, 11 insertions, 13 deletions

diff --git a/tests/twisted/muc/send-error.py b/tests/twisted/muc/send-error.py
index 4f59fbd18..80cafea6f 100644
--- a/tests/twisted/muc/send-error.py
+++ b/tests/twisted/muc/send-error.py
@@ -66,7 +66,7 @@ def send_message_and_expect_error(q, stream,
         }
     ]
 
-    sent_token = text_chan.Messages.SendMessage(greeting, dbus.UInt32(0))
+    sent_token = text_chan.Text.SendMessage(greeting, dbus.UInt32(0))
 
     stream_message, _ = q.expect_many(
         EventPattern('stream-message'),
diff --git a/tests/twisted/muc/test-muc.py b/tests/twisted/muc/test-muc.py
index 85a46d9ce..af25d73b7 100644
--- a/tests/twisted/muc/test-muc.py
+++ b/tests/twisted/muc/test-muc.py
@@ -31,7 +31,6 @@ def test(q, bus, conn, stream):
     assertContains(cs.CHANNEL_IFACE_GROUP, interfaces)
     assertContains(cs.CHANNEL_IFACE_PASSWORD, interfaces)
     assertContains(cs.CHANNEL_IFACE_CHAT_STATE, interfaces)
-    assertContains(cs.CHANNEL_IFACE_MESSAGES, interfaces)
 
     assert channel_props['TargetID'] == 'chat@conf.localhost', channel_props
     assert channel_props['Requested'] == True
@@ -96,7 +95,7 @@ def test(q, bus, conn, stream):
 
     # We ask for delivery reports (which MUCs provide) and read reports (which
     # MUCs do not provide).
-    sent_token = chan.Messages.SendMessage(greeting,
+    sent_token = chan.Text.SendMessage(greeting,
         cs.MSG_SENDING_FLAGS_REPORT_DELIVERY |
         cs.MSG_SENDING_FLAGS_REPORT_READ)
 
diff --git a/tests/twisted/servicetest.py b/tests/twisted/servicetest.py
index eedc438dd..4621ccb92 100644
--- a/tests/twisted/servicetest.py
+++ b/tests/twisted/servicetest.py
@@ -651,7 +651,7 @@ class ChannelWrapper(ProxyWrapper):
                 { 'content-type': 'text/plain',
                   'content': txt
                 }]
-        self.Messages.SendMessage(message, 0)
+        self.Text.SendMessage(message, 0)
 
 def wrap_channel(chan, type_, extra=None):
     interfaces = {
diff --git a/tests/twisted/text/destroy.py b/tests/twisted/text/destroy.py
index 0504d1d32..b05037a56 100644
--- a/tests/twisted/text/destroy.py
+++ b/tests/twisted/text/destroy.py
@@ -77,7 +77,7 @@ def test(q, bus, conn, stream):
     assertEquals(foo_handle, msg[0]['message-sender'])
     assertEquals('hello', msg[1]['content'])
 
-    messages = text_chan.Properties.Get(cs.CHANNEL_IFACE_MESSAGES, 'PendingMessages')
+    messages = text_chan.Properties.Get(cs.CHANNEL_TYPE_TEXT, 'PendingMessages')
     assertEquals([msg], messages)
 
     # destroy the channel without acking the message; it does not come back
diff --git a/tests/twisted/text/receipts.py b/tests/twisted/text/receipts.py
index c2f9e90b9..4687a2085 100644
--- a/tests/twisted/text/receipts.py
+++ b/tests/twisted/text/receipts.py
@@ -48,7 +48,7 @@ def not_sending_request_to_contact(q, bus, conn, stream, chan):
       { 'content-type': 'text/plain',
         'content': 'Mancomb Seepgood?',
       }]
-    chan.Messages.SendMessage(message, 0)
+    chan.Text.SendMessage(message, 0)
 
     e = q.expect('stream-message', to=GUYBRUSH)
     assertLength(0, list(e.stanza.elements(uri=ns.RECEIPTS, name='request')))
@@ -64,7 +64,7 @@ def sending_request_to_presenceless_contact(q, bus, conn, stream, chan):
       { 'content-type': 'text/plain',
         'content': 'Thriftweed?',
       }]
-    chan.Messages.SendMessage(message, cs.MSG_SENDING_FLAGS_REPORT_DELIVERY)
+    chan.Text.SendMessage(message, cs.MSG_SENDING_FLAGS_REPORT_DELIVERY)
 
     e = q.expect('stream-message', to=GUYBRUSH)
     assertLength(1, list(e.stanza.elements(uri=ns.RECEIPTS, name='request')))
@@ -97,7 +97,7 @@ def sending_request_to_cappy_contact(q, bus, conn, stream, chan):
       { 'content-type': 'text/plain',
         'content': 'Ulysses?',
       }]
-    chan.Messages.SendMessage(message, cs.MSG_SENDING_FLAGS_REPORT_DELIVERY)
+    chan.Text.SendMessage(message, cs.MSG_SENDING_FLAGS_REPORT_DELIVERY)
 
     e = q.expect('stream-message', to=GUYBRUSH)
     assertLength(1, list(e.stanza.elements(uri=ns.RECEIPTS, name='request')))
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index bb1b75495..6998b2b7c 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -76,7 +76,7 @@ def test(q, bus, conn, stream):
     assertEquals(foo_handle, msg[0]['message-sender'])
     assertEquals('hello', msg[1]['content'])
 
-    messages = text_chan.Properties.Get(cs.CHANNEL_IFACE_MESSAGES, 'PendingMessages')
+    messages = text_chan.Properties.Get(cs.CHANNEL_TYPE_TEXT, 'PendingMessages')
     assertEquals([msg], messages)
 
     # close the channel without acking the message; it comes back
@@ -115,7 +115,7 @@ def test(q, bus, conn, stream):
 
     # the message is still there
 
-    messages = text_chan.Properties.Get(cs.CHANNEL_IFACE_MESSAGES, 'PendingMessages')
+    messages = text_chan.Properties.Get(cs.CHANNEL_TYPE_TEXT, 'PendingMessages')
     msg[0]['rescued'] = True
     assertEquals([msg], messages)
 
@@ -123,7 +123,7 @@ def test(q, bus, conn, stream):
 
     text_chan.Text.AcknowledgePendingMessages([msg[0]['pending-message-id']])
 
-    messages = text_chan.Properties.Get(cs.CHANNEL_IFACE_MESSAGES, 'PendingMessages')
+    messages = text_chan.Properties.Get(cs.CHANNEL_TYPE_TEXT, 'PendingMessages')
     assertEquals([], messages)
 
     # close the channel again
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 7c317b470..ff7bb1678 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -38,7 +38,6 @@ def test(q, bus, conn, stream):
     assertEquals(cs.HT_CONTACT, channel_props.get('TargetHandleType'))
     assertEquals(cs.CHANNEL_TYPE_TEXT, channel_props.get('ChannelType'))
     assertContains(cs.CHANNEL_IFACE_CHAT_STATE, channel_props.get('Interfaces'))
-    assertContains(cs.CHANNEL_IFACE_MESSAGES, channel_props.get('Interfaces'))
     assertEquals(jid, channel_props['TargetID'])
     assertEquals(False, channel_props['Requested'])
     assertEquals(props[cs.INITIATOR_HANDLE], channel_props['InitiatorHandle'])
@@ -86,7 +85,7 @@ def test(q, bus, conn, stream):
         }
     ]
 
-    sent_token = text_chan.Messages.SendMessage(greeting, dbus.UInt32(0))
+    sent_token = text_chan.Text.SendMessage(greeting, dbus.UInt32(0))
 
     stream_message, message_sent = q.expect_many(
         EventPattern('stream-message'),