git.iko.soy/searx
on master help sign in
[fix] test in wolframalpha_noapi
commit2a15944b58089d84a930f36b42c6ef60d4e629b3 authora01200356 <a01200356@itesm.mx> dateSun 3 Jan 2016, 22:03 (11 years ago) parentd997265
2 files changed+42−5
compare with master
unifiedsplit
searx/engines/wolframalpha_noapi.py+6−3 searx/tests/engines/test_wolframalpha_noapi.py+36−2
searx/engines/wolframalpha_noapi.py+6−3
@@ -41,8 +41,8 @@ def response(resp):
4141
4242 # the answer is inside a js function
4343 # answer can be located in different 'pods', although by default it should be in pod_0200
44− possible_locations = ['pod_0200\.push(.*)\n',
45− 'pod_0100\.push(.*)\n']
44+ possible_locations = ['pod_0200\.push\((.*)',
45+ 'pod_0100\.push\((.*)']
4646
4747 # failed result
4848 if dom.xpath(failure_xpath):
@@ -62,7 +62,10 @@ def response(resp):
6262 if line:
6363 # extract answer from json
6464 answer = line[line.find('{'):line.rfind('}')+1]
65− answer = loads(answer.encode('unicode-escape'))
65+ try:
66+ answer = loads(answer)
67+ except Exception:
68+ answer = loads(answer.encode('unicode-escape'))
6669 answer = answer['stringified']
6770
6871 # clean plaintext answer
searx/tests/engines/test_wolframalpha_noapi.py+36−2
@@ -149,11 +149,45 @@ class TestWolframAlphaNoAPIEngine(SearxTestCase):
149149 </body>
150150 </html>
151151 """
152− # test output in htmlentity
152+ # test output with htmlentity
153153 response = mock.Mock(text=html)
154154 results = wolframalpha_noapi.response(response)
155155 self.assertEqual(type(results), list)
156156 self.assertEqual(len(results), 2)
157− self.assertIn("¥".decode('utf-8'), results[0]['answer'])
157+ self.assertIn('¥'.decode('utf-8'), results[0]['answer'])
158158 self.assertIn('1 euro to yen - Wolfram|Alpha', results[1]['title'])
159159 self.assertEquals('http://www.wolframalpha.com/input/?i=+1+euro+to+yen', results[1]['url'])
160+
161+ html = """
162+ <!DOCTYPE html>
163+ <title> distance from nairobi to kyoto in inches - Wolfram|Alpha</title>
164+ <meta charset="utf-8" />
165+ <body>
166+ <script type="text/javascript">
167+ try {
168+ if (typeof context.jsonArray.popups.pod_0100 == "undefined" ) {
169+ context.jsonArray.popups.pod_0100 = [];
170+ }
171+[...].pod_0100.push( {"stringified": "convert distance | from | Nairobi, Kenya\nto | Kyoto, Japan to inches"});
172+ } catch(e) { }
173+
174+ try {
175+ if (typeof context.jsonArray.popups.pod_0200 == "undefined" ) {
176+ context.jsonArray.popups.pod_0200 = [];
177+ }
178+pod_0200.push({"stringified": "4.295&times;10^8 inches","mOutput": "Quantity[4.295×10^8,&amp;quot;Inches&amp;quot;]"});
179+
180+ } catch(e) { }
181+ </script>
182+ </body>
183+ </html>
184+ """
185+ # test output with utf-8 character
186+ response = mock.Mock(text=html)
187+ results = wolframalpha_noapi.response(response)
188+ self.assertEqual(type(results), list)
189+ self.assertEqual(len(results), 2)
190+ self.assertIn('4.295×10^8 inches'.decode('utf-8'), results[0]['answer'])
191+ self.assertIn('distance from nairobi to kyoto in inches - Wolfram|Alpha', results[1]['title'])
192+ self.assertEquals('http://www.wolframalpha.com/input/?i=+distance+from+nairobi+to+kyoto+in+inches',
193+ results[1]['url'])