[telepathy-gabble/master] Add a hook to parse and validate all of a session initiate

[Sjoerd Simons]

---
 tests/twisted/jingle/call-state.py                 |    2 +-
 tests/twisted/jingle/hold-audio.py                 |    2 +-
 tests/twisted/jingle/hold-av.py                    |    2 +-
 tests/twisted/jingle/initial-audio-video.py        |    2 +-
 tests/twisted/jingle/jingletest2.py                |    7 ++++++-
 tests/twisted/jingle/outgoing-basics.py            |    2 +-
 .../twisted/jingle/test-content-adding-removal.py  |    2 +-
 .../twisted/jingle/test-outgoing-call-rejected.py  |    2 +-
 8 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/tests/twisted/jingle/call-state.py b/tests/twisted/jingle/call-state.py
index 3751c62..35af842 100644
--- a/tests/twisted/jingle/call-state.py
+++ b/tests/twisted/jingle/call-state.py
@@ -59,7 +59,7 @@ def test(jp, q, bus, conn, stream):
         jp.match_jingle_action(e.query, 'session-initiate'))
     stream.send(make_result_iq(stream, e.stanza))
 
-    jt.set_sid_from_initiate(e.query)
+    jt.parse_session_initiate(e.query)
 
     # The other person's client starts ringing, and tells us so!
     node = jp.SetIq(jt.peer, jt.jid, [
diff --git a/tests/twisted/jingle/hold-audio.py b/tests/twisted/jingle/hold-audio.py
index 583afc4..7d3aad3 100644
--- a/tests/twisted/jingle/hold-audio.py
+++ b/tests/twisted/jingle/hold-audio.py
@@ -45,7 +45,7 @@ def test(jp, q, bus, conn, stream):
         jp.match_jingle_action(e.query, 'session-initiate'))
     stream.send(make_result_iq(stream, e.stanza))
 
-    jt.set_sid_from_initiate(e.query)
+    jt.parse_session_initiate(e.query)
     jt.accept()
 
     q.expect('stream-iq', iq_type='result')
diff --git a/tests/twisted/jingle/hold-av.py b/tests/twisted/jingle/hold-av.py
index d40d078..062b0d8 100644
--- a/tests/twisted/jingle/hold-av.py
+++ b/tests/twisted/jingle/hold-av.py
@@ -75,7 +75,7 @@ def test(jp, q, bus, conn, stream):
         jp.match_jingle_action(e.query, 'session-initiate'))
     stream.send(make_result_iq(stream, e.stanza))
 
-    jt.set_sid_from_initiate(e.query)
+    jt.parse_session_initiate(e.query)
     jt.accept(with_video=True)
 
     q.expect('stream-iq', iq_type='result')
diff --git a/tests/twisted/jingle/initial-audio-video.py b/tests/twisted/jingle/initial-audio-video.py
index d949885..bd63b5f 100644
--- a/tests/twisted/jingle/initial-audio-video.py
+++ b/tests/twisted/jingle/initial-audio-video.py
@@ -125,7 +125,7 @@ def check_iav(jt, q, conn, bus, stream, remote_handle, initial_audio,
 
         e = q.expect('stream-iq', predicate=lambda e:
                 jt.jp.match_jingle_action(e.query, 'session-initiate'))
-        # TODO: check that the s-i contains the right contents.
+        jt.parse_session_initiate (e.query)
 
         chan.Close()
 
diff --git a/tests/twisted/jingle/jingletest2.py b/tests/twisted/jingle/jingletest2.py
index b5382ca..abd4731 100644
--- a/tests/twisted/jingle/jingletest2.py
+++ b/tests/twisted/jingle/jingletest2.py
@@ -111,6 +111,9 @@ class JingleProtocol:
     def extract_session_id(self, query):
         return query['sid']
 
+    def validate_session_initiate(self, query):
+        return True
+
     def can_do_video(self):
         return True
 
@@ -433,7 +436,9 @@ class JingleTest2:
             ])
         self.stream.send(jp.xml(node))
 
-    def set_sid_from_initiate(self, query):
+    def parse_session_initiate (self, query):
+        # Validate the session initiate and get some useful ifo from it
+        self.jp.validate_session_initiate (query)
         self.sid = self.jp.extract_session_id(query)
 
     def accept(self, with_video=False):
diff --git a/tests/twisted/jingle/outgoing-basics.py b/tests/twisted/jingle/outgoing-basics.py
index 681c6c5..e6cf1d4 100644
--- a/tests/twisted/jingle/outgoing-basics.py
+++ b/tests/twisted/jingle/outgoing-basics.py
@@ -201,7 +201,7 @@ def worker(jp, q, bus, conn, stream, variant):
             predicate=lambda e:
                 jp.match_jingle_action(e.query, 'session-initiate'))
 
-    jt2.set_sid_from_initiate(session_initiate.query)
+    jt2.parse_session_initiate(session_initiate.query)
     stream.send(jp.xml(jp.ResultIq('test at localhost', session_initiate.stanza,
         [])))
 
diff --git a/tests/twisted/jingle/test-content-adding-removal.py b/tests/twisted/jingle/test-content-adding-removal.py
index 81a1b5b..271e6c6 100644
--- a/tests/twisted/jingle/test-content-adding-removal.py
+++ b/tests/twisted/jingle/test-content-adding-removal.py
@@ -69,7 +69,7 @@ def test(jp, q, bus, conn, stream, peer_removes_final_content):
         jp.match_jingle_action(x.query, 'session-initiate'))
     stream.send(make_result_iq(stream, e.stanza))
 
-    jt.set_sid_from_initiate(e.query)
+    jt.parse_session_initiate(e.query)
 
     # Gabble sends content-remove for the video stream...
     e2 = q.expect('stream-iq', iq_type='set', predicate=lambda x:
diff --git a/tests/twisted/jingle/test-outgoing-call-rejected.py b/tests/twisted/jingle/test-outgoing-call-rejected.py
index ee27ed4..d27daab 100644
--- a/tests/twisted/jingle/test-outgoing-call-rejected.py
+++ b/tests/twisted/jingle/test-outgoing-call-rejected.py
@@ -45,7 +45,7 @@ def test(jp, q, bus, conn, stream):
         jp.match_jingle_action(e.query, 'session-initiate'))
     stream.send(make_result_iq(stream, e.stanza))
 
-    jt.set_sid_from_initiate(e.query)
+    jt.parse_session_initiate(e.query)
     jt.terminate(reason="busy")
 
     mc = q.expect('dbus-signal', signal='MembersChanged')
-- 
1.5.6.5