logo

searx

Unnamed repository; edit this file 'description' to name the repository.
commit: e9f56fe3eec3baed3f845677a38405f29ac6cd53
parent: f5be28eedb8af728ddb39de5ba4f8df54e9025f3
Author: Adam Tauber <asciimoo@gmail.com>
Date:   Wed,  4 May 2016 14:51:33 +0200

Merge pull request #553 from Maxqia/convert

[fix] currency_convert: make unit tests pass

Diffstat:

searx/engines/currency_convert.py | 6+++---
tests/unit/engines/test_currency_convert.py | 17+++++++----------
2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/searx/engines/currency_convert.py b/searx/engines/currency_convert.py @@ -9,13 +9,13 @@ categories = [] url = 'https://download.finance.yahoo.com/d/quotes.csv?e=.csv&f=sl1d1t1&s={query}=X' weight = 100 -parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9].+) (in|to) ([^\.]+)\W*$', re.I) # noqa +parser_re = re.compile(u'.*?(\d+(?:\.\d+)?) ([^.0-9]+) (?:in|to) ([^.0-9]+)', re.I) # noqa db = 1 def normalize_name(name): - name = name.lower().replace('-', ' ') + name = name.lower().replace('-', ' ').rstrip('s') name = re.sub(' +', ' ', name) return unicodedata.normalize('NFKD', name).lower() @@ -40,7 +40,7 @@ def request(query, params): # wrong query return params - ammount, from_currency, none, to_currency = m.groups() + ammount, from_currency, to_currency = m.groups() ammount = float(ammount) from_currency = name_to_iso4217(from_currency.strip()) to_currency = name_to_iso4217(to_currency.strip()) diff --git a/tests/unit/engines/test_currency_convert.py b/tests/unit/engines/test_currency_convert.py @@ -14,23 +14,19 @@ class TestCurrencyConvertEngine(SearxTestCase): params = currency_convert.request(query, dicto) self.assertNotIn('url', params) - query = '1.1.1 EUR in USD' - params = currency_convert.request(query, dicto) - self.assertNotIn('url', params) - - query = '10 eur in usd' + query = 'convert 10 Pound Sterlings to United States Dollars' params = currency_convert.request(query, dicto) self.assertIn('url', params) self.assertIn('finance.yahoo.com', params['url']) - self.assertIn('EUR', params['url']) + self.assertIn('GBP', params['url']) self.assertIn('USD', params['url']) def test_response(self): dicto = defaultdict(dict) dicto['ammount'] = float(10) - dicto['from'] = "EUR" + dicto['from'] = "GBP" dicto['to'] = "USD" - dicto['from_name'] = "euro" + dicto['from_name'] = "pound sterling" dicto['to_name'] = "United States dollar" response = mock.Mock(text='a,b,c,d', search_params=dicto) self.assertEqual(currency_convert.response(response), []) @@ -40,7 +36,8 @@ class TestCurrencyConvertEngine(SearxTestCase): results = currency_convert.response(response) self.assertEqual(type(results), list) self.assertEqual(len(results), 1) - self.assertEqual(results[0]['answer'], '10.0 EUR = 5.0 USD, 1 EUR (euro) = 0.5 USD (United States dollar)') + self.assertEqual(results[0]['answer'], '10.0 GBP = 5.0 USD, 1 GBP (pound sterling)' + + ' = 0.5 USD (United States dollar)') now_date = datetime.now().strftime('%Y%m%d') self.assertEqual(results[0]['url'], 'https://finance.yahoo.com/currency/converter-results/' + - now_date + '/10.0-eur-to-usd.html') + now_date + '/10.0-gbp-to-usd.html')