constants: fix typo in CALL_CONTENT_MEDIA_DESCRIPTION

7 files changed, 32 insertions, 32 deletions

diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 6bb50c71d..d43b22e9c 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -94,7 +94,7 @@ CALL_CONTENT = PREFIX + '.Call1.Content'
 CALL_CONTENT_IFACE_MEDIA = CALL_CONTENT + '.Interface.Media'
 CALL_CONTENT_IFACE_DTMF = CALL_CONTENT + '.Interface.DTMF'
 
-CALL_CONTENT_MEDIADESCRIPTION = CALL_CONTENT + '.MediaDescription'
+CALL_CONTENT_MEDIA_DESCRIPTION = CALL_CONTENT + '.MediaDescription'
 
 CALL_STREAM = PREFIX + '.Call1.Stream'
 CALL_STREAM_IFACE_MEDIA = CALL_STREAM + '.Interface.Media'
diff --git a/tests/twisted/jingle/call-codecoffer.py b/tests/twisted/jingle/call-codecoffer.py
index 34a3a8a42..18ccaecc3 100644
--- a/tests/twisted/jingle/call-codecoffer.py
+++ b/tests/twisted/jingle/call-codecoffer.py
@@ -26,10 +26,10 @@ def check_offer (bus, conn, content):
     assertNotEquals ("/", path)
 
     offer = bus.get_object (conn.bus_name, path)
-    md_property = offer.Get (cs.CALL_CONTENT_MEDIADESCRIPTION,
+    md_property = offer.Get (cs.CALL_CONTENT_MEDIA_DESCRIPTION,
        "Codecs", dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertEquals (md[cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"], md_property)
+    assertEquals (md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"], md_property)
 
 def accept_offer (q, bus, conn, self_handle, remote_handle,
         content, md_props, offer_path = None,
@@ -39,19 +39,19 @@ def accept_offer (q, bus, conn, self_handle, remote_handle,
 
     offer = bus.get_object (conn.bus_name, path)
 
-    offer.Accept (md_props, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    offer.Accept (md_props, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
     current_mds = content.Get (cs.CALL_CONTENT_IFACE_MEDIA,
                 "RemoteMediaDescriptions", dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertEquals (md_props[cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'],
-                  current_mds[remote_handle][cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'])
+    assertEquals (md_props[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'],
+                  current_mds[remote_handle][cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'])
 
     if codecs_changed:
         o = q.expect ('dbus-signal', signal='RemoteMediaDescriptionsChanged')
 
-        assertEquals (md_props[cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'],
-            o.args[0][remote_handle][cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'])
+        assertEquals (md_props[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'],
+            o.args[0][remote_handle][cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'])
 
 def reject_offer (q, bus, conn,
         content, codecs, offer_path = None):
@@ -60,7 +60,7 @@ def reject_offer (q, bus, conn,
 
     offer = bus.get_object (conn.bus_name, path)
 
-    offer.Reject ((0, 0, "", ""), dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    offer.Reject ((0, 0, "", ""), dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
 def update_codecs(jt2):
     contents = jt2.generate_contents()
@@ -98,7 +98,7 @@ def prepare_test(jp, q, bus, conn, stream):
 def try_to_access_old_offer(conn, path):
     try:
         offer = bus.get_object (conn.bus_name, path)
-        ret = offer.GetAll (cs.CALL_CONTENT_MEDIADESCRIPTION,
+        ret = offer.GetAll (cs.CALL_CONTENT_MEDIA_DESCRIPTION,
             dbus_interface=dbus.PROPERTIES_IFACE)
     except Exception, e:
         pass
@@ -182,7 +182,7 @@ def test_outgoing(jp, q, bus, conn, stream):
     chan = bus.get_object(conn.bus_name, ret[0].args[0][0][0])
 
     # there is no remote codec information, so this should be empty
-    assertEquals(ret[1].args[1][cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"], [])
+    assertEquals(ret[1].args[1][cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"], [])
 
     # get a list of audio codecs we can support
     md = jt2.get_call_audio_md_dbus(remote_handle)
@@ -208,13 +208,13 @@ def test_outgoing(jp, q, bus, conn, stream):
 
     # make an offer they can't refuse
     offer = bus.get_object(conn.bus_name, ret[1].args[0])
-    props = offer.GetAll(cs.CALL_CONTENT_MEDIADESCRIPTION,
+    props = offer.GetAll(cs.CALL_CONTENT_MEDIA_DESCRIPTION,
             dbus_interface=dbus.PROPERTIES_IFACE)
 
     # this also needs to be empty
     assertEquals(props["Codecs"], [])
 
-    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
     o = q.expect('dbus-signal', signal='RemoteMediaDescriptionsChanged')
 
@@ -260,17 +260,17 @@ def test_outgoing(jp, q, bus, conn, stream):
     ret = q.expect('dbus-signal', signal='NewMediaDescriptionOffer')
 
     # make sure the codec offer has the updated codecs
-    assertEquals(ret.args[1][cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"],
-                 md[cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"][:-1])
+    assertEquals(ret.args[1][cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"],
+                 md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"][:-1])
 
     # accept new offer
     offer = bus.get_object(conn.bus_name, ret.args[0])
-    md[cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"].pop()
-    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"].pop()
+    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
     # now we should both have the smaller set of codecs, easy
     o = q.expect ('dbus-signal', signal='RemoteMediaDescriptionsChanged')
-    assertEquals (md[cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"], o.args[0][remote_handle][cs.CALL_CONTENT_MEDIADESCRIPTION + ".Codecs"])
+    assertEquals (md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"], o.args[0][remote_handle][cs.CALL_CONTENT_MEDIA_DESCRIPTION + ".Codecs"])
 
     chan.Close(dbus_interface=cs.CHANNEL)
     signal = q.expect('dbus-signal', signal='ChannelClosed')
diff --git a/tests/twisted/jingle/call-hold-av.py b/tests/twisted/jingle/call-hold-av.py
index 441a453cf..82f0b0987 100644
--- a/tests/twisted/jingle/call-hold-av.py
+++ b/tests/twisted/jingle/call-hold-av.py
@@ -62,7 +62,7 @@ class CallHoldAVTest(CallTest):
         [path, _] = content.Get(cs.CALL_CONTENT_IFACE_MEDIA,
                 "MediaDescriptionOffer", dbus_interface=dbus.PROPERTIES_IFACE)
         offer = bus.get_object (conn.bus_name, path)
-        offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+        offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
     
         assertEquals(cs.CALL_STREAM_FLOW_STATE_STOPPED,
                 cstream.Get(cs.CALL_STREAM_IFACE_MEDIA, 'SendingState',
@@ -104,7 +104,7 @@ class CallHoldAVTest(CallTest):
         [path, _] = content.Get(cs.CALL_CONTENT_IFACE_MEDIA,
                 "MediaDescriptionOffer", dbus_interface=dbus.PROPERTIES_IFACE)
         offer = bus.get_object (conn.bus_name, path)
-        offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+        offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
     
         assertEquals(cs.CALL_STREAM_FLOW_STATE_STOPPED,
                 cstream.Get(cs.CALL_STREAM_IFACE_MEDIA, 'SendingState',
diff --git a/tests/twisted/jingle/call-muc.py b/tests/twisted/jingle/call-muc.py
index 213e4b45a..f82c07eee 100644
--- a/tests/twisted/jingle/call-muc.py
+++ b/tests/twisted/jingle/call-muc.py
@@ -231,7 +231,7 @@ def run_outgoing_test(q, bus, conn, stream, close_channel=False):
 
     e = q.expect('dbus-signal', signal = 'NewMediaDescriptionOffer')
     offer = bus.get_object (conn.bus_name, e.args[0])
-    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
     jt.incoming_call(audio = "Audio")
 
diff --git a/tests/twisted/jingle/call_helper.py b/tests/twisted/jingle/call_helper.py
index 6554e0421..b6b1e1add 100644
--- a/tests/twisted/jingle/call_helper.py
+++ b/tests/twisted/jingle/call_helper.py
@@ -107,13 +107,13 @@ class CallTest(object):
         assertNotEquals("/", path)
 
         offer = self.bus.get_object(self.conn.bus_name, path)
-        codecmap_property = offer.Get(cs.CALL_CONTENT_MEDIADESCRIPTION,
+        codecmap_property = offer.Get(cs.CALL_CONTENT_MEDIA_DESCRIPTION,
                 "Codecs", dbus_interface=dbus.PROPERTIES_IFACE)
 
-        assertEquals(remote_md[cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'],
+        assertEquals(remote_md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'],
                 codecmap_property)
 
-        offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+        offer.Accept(md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
         current_md = content.Get(cs.CALL_CONTENT_IFACE_MEDIA,
                 "LocalMediaDescriptions", dbus_interface=dbus.PROPERTIES_IFACE)
diff --git a/tests/twisted/jingle/callutils.py b/tests/twisted/jingle/callutils.py
index 8688c9b71..b4db0b0f7 100644
--- a/tests/twisted/jingle/callutils.py
+++ b/tests/twisted/jingle/callutils.py
@@ -37,7 +37,7 @@ def check_and_accept_offer (q, bus, conn, content, md, in_remote_handle = 0,
     [path, remote_md] = content.Get(cs.CALL_CONTENT_IFACE_MEDIA,
                 "MediaDescriptionOffer", dbus_interface=dbus.PROPERTIES_IFACE)
 
-    remote_handle = remote_md[cs.CALL_CONTENT_MEDIADESCRIPTION + '.RemoteContact']
+    remote_handle = remote_md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.RemoteContact']
 
     if in_remote_handle != 0:
         assertEquals(remote_handle, in_remote_handle)
@@ -48,12 +48,12 @@ def check_and_accept_offer (q, bus, conn, content, md, in_remote_handle = 0,
     assertNotEquals ("/", path)
 
     offer = bus.get_object (conn.bus_name, path)
-    codecmap_property = offer.Get (cs.CALL_CONTENT_MEDIADESCRIPTION,
+    codecmap_property = offer.Get (cs.CALL_CONTENT_MEDIA_DESCRIPTION,
         "Codecs", dbus_interface=dbus.PROPERTIES_IFACE)
 
-    assertEquals (remote_md[cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs'], codecmap_property)
+    assertEquals (remote_md[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs'], codecmap_property)
 
-    offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIADESCRIPTION)
+    offer.Accept (md, dbus_interface=cs.CALL_CONTENT_MEDIA_DESCRIPTION)
 
     current_md = content.Get(cs.CALL_CONTENT_IFACE_MEDIA,
                 "LocalMediaDescriptions", dbus_interface=dbus.PROPERTIES_IFACE)
diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index 64eaa40e8..1883960c1 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -823,18 +823,18 @@ class JingleTest2(object):
 
     def get_call_audio_md_dbus(self, handle = 0):
         d =  dbus.Dictionary(
-            { cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs': self.__get_call_audio_codecs_dbus(),
+            { cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs': self.__get_call_audio_codecs_dbus(),
             }, signature='sv')
         if handle != 0:
-            d[cs.CALL_CONTENT_MEDIADESCRIPTION + '.RemoteContact'] = dbus.UInt32 (handle)
+            d[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.RemoteContact'] = dbus.UInt32 (handle)
         return d
 
     def get_call_video_md_dbus(self, handle = 0):
         d = dbus.Dictionary(
-            { cs.CALL_CONTENT_MEDIADESCRIPTION + '.Codecs': self.__get_call_video_codecs_dbus(),
+            { cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.Codecs': self.__get_call_video_codecs_dbus(),
             }, signature='sv')
         if handle != 0:
-            d[cs.CALL_CONTENT_MEDIADESCRIPTION + '.RemoteContact'] = dbus.UInt32 (handle)
+            d[cs.CALL_CONTENT_MEDIA_DESCRIPTION + '.RemoteContact'] = dbus.UInt32 (handle)
         return d
 
     def get_remote_transports_dbus(self):