[telepathy-gabble/master] send reported fields in extended search results

[Guillaume Desmottes]

---
 tests/twisted/search/extended.py      |   10 +++++-----
 tests/twisted/search/search_helper.py |    9 +++++++--
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/tests/twisted/search/extended.py b/tests/twisted/search/extended.py
index a6a357f..aa4b014 100644
--- a/tests/twisted/search/extended.py
+++ b/tests/twisted/search/extended.py
@@ -56,13 +56,13 @@ def do_one_search(q, bus, conn, requests, stream, fields, expected_search_keys,
     # We make a search.
     iq = make_search(q, c_search, c_props, server, terms)
     query = iq.firstChildElement()
-    fields = xpath.queryForNodes(
+    fields_sent = xpath.queryForNodes(
         '/iq/query[@xmlns="%s"]/x[@xmlns="%s"][@type="submit"]/field'
         % (ns.SEARCH, ns.X_DATA), iq)
-    assert fields is not None
+    assert fields_sent is not None
 
     # check FORM_TYPE
-    f = fields[0]
+    f = fields_sent[0]
     assert f['type'] == 'hidden'
     assert f['var'] == 'FORM_TYPE'
     value = f.firstChildElement()
@@ -71,13 +71,13 @@ def do_one_search(q, bus, conn, requests, stream, fields, expected_search_keys,
 
     # extract search fields
     search_fields = []
-    for f in fields[1:]:
+    for f in fields_sent[1:]:
         value = f.firstChildElement()
         assert value.name == 'value'
         search_fields.append((f['var'], value.children[0]))
 
     # Server sends the results of the search.
-    send_results_extended(stream, iq, results)
+    send_results_extended(stream, iq, results, fields)
 
     return search_fields, c, c_search, c_props
 
diff --git a/tests/twisted/search/search_helper.py b/tests/twisted/search/search_helper.py
index b0b17fc..9e949bb 100644
--- a/tests/twisted/search/search_helper.py
+++ b/tests/twisted/search/search_helper.py
@@ -102,7 +102,7 @@ def send_results(stream, iq, results):
         item.addElement('email', content=jid)
     stream.send(result)
 
-def send_results_extended(stream, iq, results):
+def send_results_extended(stream, iq, results, fields):
     result = IQ(stream, 'result')
     result['id'] = iq['id']
     query = result.addElement((ns.SEARCH, 'query'))
@@ -115,7 +115,12 @@ def send_results_extended(stream, iq, results):
     field['var'] = 'FORM_TYPE'
     field.addElement('value', content=ns.SEARCH)
 
-    # TODO: add reported
+    # add reported fields
+    reported = x.addElement('reported')
+    for var, type, label, options in fields:
+        field = reported.addElement('field')
+        field['var'] = var
+        field['label'] = label
 
     # add results
     for r in results:
-- 
1.5.6.5