on master help sign in
Correct a few UT
commit56ad00bc3292c345dfaa5a671844e222b5f72e5b authorCqoicebordel <Cqoicebordel@users.noreply.github.com> dateFri 20 Feb 2015, 19:03 (12 years ago) parentaea0f86
3 files changed+18−18
searx/tests/engines/test_blekko_images.py+8−3 searx/tests/engines/test_google_images.py+8−3 searx/tests/engines/test_yahoo.py+2−12
searx/tests/engines/test_blekko_images.py+8−3
@@ -12,9 +12,14 @@ class TestBlekkoImagesEngine(SearxTestCase):
1212 dicto['pageno'] = 0
1313 dicto['safesearch'] = 1
1414 params = blekko_images.request(query, dicto)
15− self.assertTrue('url' in params)
16− self.assertTrue(query in params['url'])
17− self.assertTrue('blekko.com' in params['url'])
15+ self.assertIn('url', params)
16+ self.assertIn(query, params['url'])
17+ self.assertIn('blekko.com', params['url'])
18+ self.assertIn('page', params['url'])
19+
20+ dicto['pageno'] = 1
21+ params = blekko_images.request(query, dicto)
22+ self.assertNotIn('page', params['url'])
1823
1924 def test_response(self):
2025 self.assertRaises(AttributeError, blekko_images.response, None)
searx/tests/engines/test_google_images.py+8−3
@@ -11,9 +11,14 @@ class TestGoogleImagesEngine(SearxTestCase):
1111 dicto = defaultdict(dict)
1212 dicto['pageno'] = 1
1313 params = google_images.request(query, dicto)
14− self.assertTrue('url' in params)
15− self.assertTrue(query in params['url'])
16− self.assertTrue('googleapis.com' in params['url'])
14+ self.assertIn('url', params)
15+ self.assertIn(query, params['url'])
16+ self.assertIn('googleapis.com', params['url'])
17+ self.assertIn('safe=on', params['url'])
18+
19+ dicto['safesearch'] = 0
20+ params = google_images.request(query, dicto)
21+ self.assertIn('safe=off', params['url'])
1722
1823 def test_response(self):
1924 self.assertRaises(AttributeError, google_images.response, None)
searx/tests/engines/test_yahoo.py+2−12
@@ -75,12 +75,6 @@ class TestYahooEngine(SearxTestCase):
7575 <li>
7676 <div class="dd algo lst Sr">
7777 <div class="compTitle">
78− <h3 class="title"><a class=" td-u" href="http://r.search.yahoo.com/_ylt=AwrBT7zgEudUW.wAe2ZXNyoA;
79− _ylu=X3oDMTBybGY3bmpvBGNvbG8DYmYxBHBvcwMyBHZ0aWQDBHNlYwNzcg--/RV=2\/RE=1424458593/RO=10
80− /RU=https%3a%2f%2fthis.is.the.second.url%2f/RK=0/RS=jIctjj_cBH1Efj88GCgHKp3__Qk-"
81− target="_blank" data-bid="54e712e136926">
82− This is the second <b><b>title</b></b></a>
83− </h3>
8478 </div>
8579 <div class="compText aAbs">
8680 <p class="lh-18">This is the second content</p>
@@ -102,16 +96,12 @@ class TestYahooEngine(SearxTestCase):
10296 """
10397 response = mock.Mock(text=html)
10498 results = yahoo.response(response)
105− print results
10699 self.assertEqual(type(results), list)
107− self.assertEqual(len(results), 3)
100+ self.assertEqual(len(results), 2)
108101 self.assertEqual(results[0]['title'], 'This is the title')
109102 self.assertEqual(results[0]['url'], 'https://this.is.the.url/')
110103 self.assertEqual(results[0]['content'], 'This is the content')
111− self.assertEqual(results[1]['title'], 'This is the second title')
112− self.assertEqual(results[1]['url'], 'https://this.is.the.second.url/')
113− self.assertEqual(results[1]['content'], 'This is the second content')
114− self.assertEqual(results[2]['suggestion'], 'This is the suggestion')
104+ self.assertEqual(results[1]['suggestion'], 'This is the suggestion')
115105
116106 html = """
117107<ol class="reg mb-15 searchCenterMiddle">