[telepathy-haze/master] Tests: don't assume <body> is <message>'s first child

Tue Aug 25 08:19:03 PDT 2009

---
 tests/twisted/text/destroy.py   |   11 ++++++++---
 tests/twisted/text/initiate.py  |   11 ++++++++---
 tests/twisted/text/respawn.py   |   11 ++++++++---
 tests/twisted/text/test-text.py |   22 ++++++++++++++++------
 4 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/tests/twisted/text/destroy.py b/tests/twisted/text/destroy.py
index 6e488da..fdf4f34 100644
--- a/tests/twisted/text/destroy.py
+++ b/tests/twisted/text/destroy.py
@@ -83,9 +83,14 @@ def test(q, bus, conn, stream):
     elem = event.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(event.stanza.elements())[0]
-    assert body.name == 'body'
-    assert body.children[0] == u'hey'
+
+    found = False
+    for e in elem.elements():
+        if e.name == 'body':
+            found = True
+            e.children[0] == u'hey'
+            break
+    assert found, elem.toXml()
 
     # <message type="chat"><body>hello</body</message>
     m = domish.Element((None, 'message'))
diff --git a/tests/twisted/text/initiate.py b/tests/twisted/text/initiate.py
index 1552091..3426049 100644
--- a/tests/twisted/text/initiate.py
+++ b/tests/twisted/text/initiate.py
@@ -70,9 +70,14 @@ def test(q, bus, conn, stream):
     elem = event.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(event.stanza.elements())[0]
-    assert body.name == 'body'
-    assert body.children[0] == u'hey'
+
+    found = False
+    for e in elem.elements():
+        if e.name == 'body':
+            found = True
+            e.children[0] == u'hey'
+            break
+    assert found, elem.toXml()
 
     # <message type="chat"><body>hello</body</message>
     m = domish.Element((None, 'message'))
diff --git a/tests/twisted/text/respawn.py b/tests/twisted/text/respawn.py
index deef006..966c417 100644
--- a/tests/twisted/text/respawn.py
+++ b/tests/twisted/text/respawn.py
@@ -80,9 +80,14 @@ def test(q, bus, conn, stream):
     elem = event.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(event.stanza.elements())[0]
-    assert body.name == 'body'
-    assert body.children[0] == u'hey'
+
+    found = False
+    for e in elem.elements():
+        if e.name == 'body':
+            found = True
+            e.children[0] == u'hey'
+            break
+    assert found, elem.toXml()
 
     # <message type="chat"><body>hello</body</message>
     m = domish.Element((None, 'message'))
diff --git a/tests/twisted/text/test-text.py b/tests/twisted/text/test-text.py
index 244ea94..3e4ee36 100644
--- a/tests/twisted/text/test-text.py
+++ b/tests/twisted/text/test-text.py
@@ -122,9 +122,14 @@ def test(q, bus, conn, stream):
     elem = stream_message.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(stream_message.stanza.elements())[0]
-    assert body.name == 'body'
-    assert body.children[0] == u'/me waves'
+
+    found = False
+    for e in elem.elements():
+        if e.name == 'body':
+            found = True
+            e.children[0] == u'/me waves'
+            break
+    assert found, elem.toXml()
 
     sent_message = message_sent.args[0]
     assert len(sent_message) == 2, sent_message
@@ -151,9 +156,14 @@ def test(q, bus, conn, stream):
     elem = stream_message.stanza
     assert elem.name == 'message'
     assert elem['type'] == 'chat'
-    body = list(stream_message.stanza.elements())[0]
-    assert body.name == 'body'
-    assert body.children[0] == u'goodbye'
+
+    found = False
+    for e in elem.elements():
+        if e.name == 'body':
+            found = True
+            e.children[0] == u'goodbye'
+            break
+    assert found, elem.toXml()
 
     sent_message = message_sent.args[0]
     assert len(sent_message) == 2, sent_message
-- 
1.5.6.5


