git.iko.soy/searx
on master help sign in
[fix] currency_convert: make unit tests pass

also make regex more efficent and normalize 's'es

commit56e53c929777a0a47d9e702219dbab4326c63010 authorMaxqia <contrib@maxqia.com> dateMon 2 May 2016, 17:06 (10 years ago) parentdcc8f99
2 files changed+10−13
compare with master
unifiedsplit
searx/engines/currency_convert.py+3−3 tests/unit/engines/test_currency_convert.py+7−10
searx/engines/currency_convert.py+3−3
@@ -9,13 +9,13 @@ categories = []
99url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X'
1010weight = 100
1111
12−parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9].+) (in|to) ([^\.]+)\W*$', re.I) # noqa
12+parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) # noqa
1313
1414db = 1
1515
1616
1717def normalize_name(name):
18− name = name.lower().replace('-', ' ')
18+ name = name.lower().replace('-', ' ').rstrip('s')
1919 name = re.sub(' +', ' ', name)
2020 return unicodedata.normalize('NFKD', name).lower()
2121
@@ -40,7 +40,7 @@ def request(query, params):
4040 # wrong query
4141 return params
4242
43− ammount, from_currency, none, to_currency = m.groups()
43+ ammount, from_currency, to_currency = m.groups()
4444 ammount = float(ammount)
4545 from_currency = name_to_iso4217(from_currency.strip())
4646 to_currency = name_to_iso4217(to_currency.strip())
tests/unit/engines/test_currency_convert.py+7−10
@@ -14,23 +14,19 @@ class TestCurrencyConvertEngine(SearxTestCase):
1414 params = currency_convert.request(query, dicto)
1515 self.assertNotIn('url', params)
1616
17− query = '1.1.1 EUR in USD'
18− params = currency_convert.request(query, dicto)
19− self.assertNotIn('url', params)
20−
21− query = '10 eur in usd'
17+ query = 'convert 10 Pound Sterlings to United States Dollars'
2218 params = currency_convert.request(query, dicto)
2319 self.assertIn('url', params)
2420 self.assertIn('finance.yahoo.com', params['url'])
25− self.assertIn('EUR', params['url'])
21+ self.assertIn('GBP', params['url'])
2622 self.assertIn('USD', params['url'])
2723
2824 def test_response(self):
2925 dicto = defaultdict(dict)
3026 dicto['ammount'] = float(10)
31− dicto['from'] = "EUR"
27+ dicto['from'] = "GBP"
3228 dicto['to'] = "USD"
33− dicto['from_name'] = "euro"
29+ dicto['from_name'] = "pound sterling"
3430 dicto['to_name'] = "United States dollar"
3531 response = mock.Mock(text='a,b,c,d', search_params=dicto)
3632 self.assertEqual(currency_convert.response(response), [])
@@ -40,7 +36,8 @@ class TestCurrencyConvertEngine(SearxTestCase):
4036 results = currency_convert.response(response)
4137 self.assertEqual(type(results), list)
4238 self.assertEqual(len(results), 1)
43− self.assertEqual(results[0]['answer'], '10.0 EUR = 5.0 USD, 1 EUR (euro) = 0.5 USD (United States dollar)')
39+ self.assertEqual(results[0]['answer'], '10.0 GBP = 5.0 USD, 1 GBP (pound sterling)' +
40+ ' = 0.5 USD (United States dollar)')
4441 now_date = datetime.now().strftime('%Y%m%d')
4542 self.assertEqual(results[0]['url'], 'https://finance.yahoo.com/currency/converter-results/' +
46− now_date + '/10.0-eur-to-usd.html')
43+ now_date + '/10.0-gbp-to-usd.html')