http://www.mediawiki.org/wiki/Special:Code/pywikipedia/9837
Revision: 9837
Author: valhallasw
Date: 2012-01-21 13:53:37 +0000 (Sat, 21 Jan 2012)
Log Message:
-----------
Updated query tests:
extra return values from the server are now ignored
Modified Paths:
--------------
trunk/pywikipedia/tests/test_query.py
Modified: trunk/pywikipedia/tests/test_query.py
===================================================================
--- trunk/pywikipedia/tests/test_query.py 2012-01-21 13:46:03 UTC (rev 9836)
+++ trunk/pywikipedia/tests/test_query.py 2012-01-21 13:53:37 UTC (rev 9837)
@@ -16,8 +16,18 @@
def assertEqualQueryResult(self, params, expectedresult):
data = query.GetData(params, self.site)
- self.assertEqual(data[u'query'], expectedresult)
+ self.recursiveConfirmKeyValues(expectedresult, data[u'query'])
+ def recursiveConfirmKeyValues(self, expected, measured):
+ if isinstance(expected, dict) and isinstance(measured, dict):
+ for key in expected.keys():
+ self.recursiveConfirmKeyValues(expected[key], measured[key])
+ elif isinstance(expected, list) and isinstance(measured, list):
+ for key in range((len(expected))):
+ self.recursiveConfirmKeyValues(expected[key], measured[key])
+ else:
+ self.assertEqual(expected, measured)
+
def test_basic(self):
params = {
'action': 'query',