@@ -55,86 +55,83 @@ class TestYahooEngine(SearxTestCase):
5555 self.assertEqual(yahoo.response(response), [])
5656
5757 html = """
58− <div class="res">
59− <div>
60− <h3>
61− <a id="link-1" class="yschttl spt" href="http://r.search.yahoo.com/_ylt=A0LEVzClb9JUSKcAEGRXNyoA;
62− _ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb2xvA2JmMQR2dGlkA1NNRTcwM18x/RV=2/RE=1423106085/RO=10
63− /RU=https%3a%2f%2fthis.is.the.url%2f/RK=0/RS=dtcJsfP4mEeBOjnVfUQ-"target="_blank" data-bk="5063.1">
64− <b>This</b> is the title
65− </a>
58+<ol class="reg mb-15 searchCenterMiddle">
59+ <li class="first">
60+ <div class="dd algo fst Sr">
61+ <div class="compTitle">
62+ <h3 class="title"><a class=" td-u" href="http://r.search.yahoo.com/_ylt=A0LEb9JUSKcAEGRXNyoA;
63+ _ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb2xvA2Jm2dGlkA1NNRTcwM18x/RV=2/RE=1423106085/RO=10
64+ /RU=https%3a%2f%2fthis.is.the.url%2f/RK=0/RS=dtcJsfP4mEeBOjnVfUQ-"
65+ target="_blank" data-bid="54e712e13671c">
66+ <b><b>This is the title</b></b></a>
6667 </h3>
6768 </div>
68− <span class="url" dir="ltr">www.<b>test</b>.com</span>
69− <div class="abstr">
70− <b>This</b> is the content
69+ <div class="compText aAbs">
70+ <p class="lh-18"><b><b>This is the </b>content</b>
71+ </p>
7172 </div>
7273 </div>
73− <div id="satat" data-bns="Yahoo" data-bk="124.1">
74− <h2>Also Try</h2>
75− <table>
76− <tbody>
77− <tr>
78− <td>
79− <a id="srpnat0" class="" href="https://search.yahoo.com/search=rs-bottom" >
80− <span>
81− <b></b>This is <b>the suggestion</b>
82− </span>
83− </a>
84− </td>
85− </tr>
86− </tbody>
87− </table>
74+ </li>
75+ <li>
76+ <div class="dd algo lst Sr">
77+ <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>
84+ </div>
85+ <div class="compText aAbs">
86+ <p class="lh-18">This is the second content</p>
87+ </div>
8888 </div>
89+ </li>
90+</ol>
91+<div class="dd assist fst lst AlsoTry" data-bid="54e712e138d04">
92+ <div class="compTitle mb-4 h-17">
93+ <h3 class="title">Also Try</h3> </div>
94+ <table class="compTable m-0 ac-1st td-u fz-ms">
95+ <tbody>
96+ <tr>
97+ <td class="w-50p pr-28"><a href="https://search.yahoo.com/"><B>This is the </B>suggestion<B></B></a>
98+ </td>
99+ </tr>
100+ </table>
101+</div>
89102 """
90103 response = mock.Mock(text=html)
91104 results = yahoo.response(response)
105+ print results
92106 self.assertEqual(type(results), list)
93− self.assertEqual(len(results), 2)
107+ self.assertEqual(len(results), 3)
94108 self.assertEqual(results[0]['title'], 'This is the title')
95109 self.assertEqual(results[0]['url'], 'https://this.is.the.url/')
96110 self.assertEqual(results[0]['content'], 'This is the content')
97− self.assertEqual(results[1]['suggestion'], 'This is the suggestion')
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')
98115
99116 html = """
100− <div class="res">
101− <div>
102− <h3>
103− <a id="link-1" class="yschttl spt" href="http://r.search.yahoo.com/_ylt=A0LEVzClb9JUSKcAEGRXNyoA;
104− _ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb2xvA2JmMQR2dGlkA1NNRTcwM18x/RV=2/RE=1423106085/RO=10
105− /RU=https%3a%2f%2fthis.is.the.url%2f/RK=0/RS=dtcJsfP4mEeBOjnVfUQ-"target="_blank" data-bk="5063.1">
106− <b>This</b> is the title
107− </a>
108− </h3>
109− </div>
110− <span class="url" dir="ltr">www.<b>test</b>.com</span>
111− <div class="abstr">
112− <b>This</b> is the content
113− </div>
114− </div>
115− <div class="res">
116− <div>
117− <h3>
118− <a id="link-1" class="yschttl spt">
119− <b>This</b> is the title
120− </a>
121− </h3>
122− </div>
123− <span class="url" dir="ltr">www.<b>test</b>.com</span>
124− <div class="abstr">
125− <b>This</b> is the content
126− </div>
127− </div>
128− <div class="res">
129− <div>
130− <h3>
117+<ol class="reg mb-15 searchCenterMiddle">
118+ <li class="first">
119+ <div class="dd algo fst Sr">
120+ <div class="compTitle">
121+ <h3 class="title"><a class=" td-u" href="http://r.search.yahoo.com/_ylt=A0LEb9JUSKcAEGRXNyoA;
122+ _ylu=X3oDMTEzZm1qazYwBHNlYwNzcgRwb3MDMQRjb2xvA2Jm2dGlkA1NNRTcwM18x/RV=2/RE=1423106085/RO=10
123+ /RU=https%3a%2f%2fthis.is.the.url%2f/RK=0/RS=dtcJsfP4mEeBOjnVfUQ-"
124+ target="_blank" data-bid="54e712e13671c">
125+ <b><b>This is the title</b></b></a>
131126 </h3>
132127 </div>
133− <span class="url" dir="ltr">www.<b>test</b>.com</span>
134− <div class="abstr">
135− <b>This</b> is the content
128+ <div class="compText aAbs">
129+ <p class="lh-18"><b><b>This is the </b>content</b>
130+ </p>
136131 </div>
137132 </div>
133+ </li>
134+</ol>
138135 """
139136 response = mock.Mock(text=html)
140137 results = yahoo.response(response)