[telepathy-gabble/master] s/_CAPA/_CAPS/ for taste purposes
Dafydd Harries
daf at rhydd.org
Tue Apr 7 07:37:57 PDT 2009
---
tests/twisted/constants.py | 2 +-
tests/twisted/test-caps-tubes.py | 60 +++++++++++++++++++-------------------
2 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/tests/twisted/constants.py b/tests/twisted/constants.py
index 36a1a58..f69246c 100644
--- a/tests/twisted/constants.py
+++ b/tests/twisted/constants.py
@@ -36,7 +36,7 @@ INTERFACES = CHANNEL + '.Interfaces'
CONN = "org.freedesktop.Telepathy.Connection"
CONN_IFACE_CONTACTS = CONN + '.Interface.Contacts'
-CONN_IFACE_CONTACT_CAPA = CONN + '.Interface.ContactCapabilities.DRAFT'
+CONN_IFACE_CONTACT_CAPS = CONN + '.Interface.ContactCapabilities.DRAFT'
CONN_IFACE_REQUESTS = CONN + '.Interface.Requests'
ERROR = 'org.freedesktop.Telepathy.Error'
diff --git a/tests/twisted/test-caps-tubes.py b/tests/twisted/test-caps-tubes.py
index a8a43ca..6e7f7e2 100644
--- a/tests/twisted/test-caps-tubes.py
+++ b/tests/twisted/test-caps-tubes.py
@@ -72,7 +72,7 @@ go_fixed_properties = dbus.Dictionary({
def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, client):
- conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPA)
+ conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPS)
conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
# send presence with no tube cap
@@ -108,8 +108,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -151,8 +151,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == generic_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -196,8 +196,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -240,8 +240,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -288,8 +288,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -343,8 +343,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == all_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -377,8 +377,8 @@ def test_tube_caps_from_contact(q, bus, conn, stream, contact, contact_handle, c
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [contact_handle], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [contact_handle][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [contact_handle], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [contact_handle][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[contact_handle], \
caps_via_contacts_iface
@@ -412,7 +412,7 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
(xiangqi_fixed_properties, specialized_tube_allowed_properties),
(go_fixed_properties, specialized_tube_allowed_properties)]})
- conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPA)
+ conn_caps_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACT_CAPS)
conn_contacts_iface = dbus.Interface(conn, cs.CONN_IFACE_CONTACTS)
# Check our own caps
@@ -420,8 +420,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise nothing
@@ -433,8 +433,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == basic_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
sync_stream(q, stream)
@@ -459,8 +459,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise xiangqi
@@ -483,8 +483,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
@@ -507,8 +507,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise 4 tubes
@@ -532,8 +532,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == all_tubes_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
# Advertise daap + xiangqi
@@ -556,8 +556,8 @@ def test_tube_caps_to_contact(q, bus, conn, stream):
assert caps == daap_xiangqi_caps, caps
# check the Contacts interface give the same caps
caps_via_contacts_iface = conn_contacts_iface.GetContactAttributes(
- [1], [cs.CONN_IFACE_CONTACT_CAPA], False) \
- [1][cs.CONN_IFACE_CONTACT_CAPA + '/caps']
+ [1], [cs.CONN_IFACE_CONTACT_CAPS], False) \
+ [1][cs.CONN_IFACE_CONTACT_CAPS + '/caps']
assert caps_via_contacts_iface == caps[1], caps_via_contacts_iface
--
1.5.6.5
More information about the telepathy-commits
mailing list