diff --git a/searx/engines/bing_images.py b/searx/engines/bing_images.py
index 9ae498427..9d1c22f5a 100644
--- a/searx/engines/bing_images.py
+++ b/searx/engines/bing_images.py
@@ -33,7 +33,10 @@ def request(query, params):
offset = (params['pageno'] - 1) * 10 + 1
# required for cookie
- language = 'en-US'
+ if params['language'] == 'all':
+ language = 'en-US'
+ else:
+ language = params['language'].replace('_', '-')
search_path = search_string.format(
query=urlencode({'q': query}),
diff --git a/searx/tests/engines/test_bing_images.py b/searx/tests/engines/test_bing_images.py
new file mode 100644
index 000000000..59c134623
--- /dev/null
+++ b/searx/tests/engines/test_bing_images.py
@@ -0,0 +1,268 @@
+# -*- coding: utf-8 -*-
+from collections import defaultdict
+import mock
+from searx.engines import bing_images
+from searx.testing import SearxTestCase
+
+
+class TestBingImagesEngine(SearxTestCase):
+
+ def test_request(self):
+ query = 'test_query'
+ dicto = defaultdict(dict)
+ dicto['pageno'] = 1
+ dicto['language'] = 'fr_FR'
+ params = bing_images.request(query, dicto)
+ self.assertTrue('url' in params)
+ self.assertTrue(query in params['url'])
+ self.assertTrue('bing.com' in params['url'])
+ self.assertTrue('SRCHHPGUSR' in params['cookies'])
+ self.assertTrue('fr' in params['cookies']['SRCHHPGUSR'])
+
+ dicto['language'] = 'all'
+ params = bing_images.request(query, dicto)
+ self.assertIn('SRCHHPGUSR', params['cookies'])
+ self.assertIn('en', params['cookies']['SRCHHPGUSR'])
+
+ def test_response(self):
+ self.assertRaises(AttributeError, bing_images.response, None)
+ self.assertRaises(AttributeError, bing_images.response, [])
+ self.assertRaises(AttributeError, bing_images.response, '')
+ self.assertRaises(AttributeError, bing_images.response, '[]')
+
+ response = mock.Mock(content='')
+ self.assertEqual(bing_images.response(response), [])
+
+ response = mock.Mock(content='')
+ self.assertEqual(bing_images.response(response), [])
+
+ html = """
+
+ """
+ html = html.replace('\r\n', '').replace('\n', '').replace('\r', '')
+ response = mock.Mock(content=html)
+ results = bing_images.response(response)
+ self.assertEqual(type(results), list)
+ self.assertEqual(len(results), 1)
+ self.assertEqual(results[0]['title'], 'Test Query')
+ self.assertEqual(results[0]['url'], 'http://www.page.url/')
+ self.assertEqual(results[0]['content'], '')
+ self.assertEqual(results[0]['thumbnail_src'], 'http://ts1.mm.bing.net/th?id=HN.608003696942779811')
+ self.assertEqual(results[0]['img_src'], 'http://test.url/Test%20Query.jpg')
+
+ html = """
+
+ 
+
+ """
+ response = mock.Mock(content=html)
+ results = bing_images.response(response)
+ self.assertEqual(type(results), list)
+ self.assertEqual(len(results), 0)
+
+ html = """
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ """
+ html = html.replace('\r\n', '').replace('\n', '').replace('\r', '')
+ response = mock.Mock(content=html)
+ results = bing_images.response(response)
+ self.assertEqual(type(results), list)
+ self.assertEqual(len(results), 10)
diff --git a/searx/tests/test_engines.py b/searx/tests/test_engines.py
index 561b436ff..fab911d13 100644
--- a/searx/tests/test_engines.py
+++ b/searx/tests/test_engines.py
@@ -1,4 +1,5 @@
from searx.tests.engines.test_bing import * # noqa
+from searx.tests.engines.test_bing_images import * # noqa
from searx.tests.engines.test_dailymotion import * # noqa
from searx.tests.engines.test_deezer import * # noqa
from searx.tests.engines.test_deviantart import * # noqa