Merge lp:~submarine/ubuntu-scopes/googlenews-25-limit into lp:~submarine/ubuntu-scopes/googlenews

[David Callé]

Limit to 25 results for speed and ease of exploration. Don't search for <3 characters.

Limit to 25 results for speed and ease of exploration. Don't search for <3 characters.

[James Henstridge (jamesh)]

Could you add test coverage to show that searches of two characters or less give no results?

[James Henstridge (jamesh)]

review: Needs Fixing

[lp:~submarine/ubuntu-scopes/googlenews-25-limit]

59. By David Callé on 2013-03-25

Add test for search <= 2 characters

[David Callé (davidc3)]

Added test.

[James Henstridge (jamesh)]

Looks good. But in future, I wouldn't bother with useless for loops like "for s in ['qu']:" -- if you need to extend a test to cover multiple cases in the future, add it in then. As it is, it just makes the test more difficult to read for little benefit.

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'src/unity_googlenews_daemon.py'
--- src/unity_googlenews_daemon.py	2013-03-20 11:01:43 +0000
+++ src/unity_googlenews_daemon.py	2013-03-25 13:44:20 +0000
@@ -115,20 +115,22 @@
         country, city = get_location()
 
     results = []
+    if not search or len(search) <= 2:
+        return results
     for cat in range(0,2):
         topic = ''
         scoring = "r"
         if search:
             search = urllib.parse.quote(search)
             if cat == 0:
-                rss = "%s?output=rss&q=%s&num=50&scoring=%s&ned=%s&geo=%s&topic=%s" % (SEARCH_URI, search, scoring, country, city, topic)
+                rss = "%s?output=rss&q=%s&num=25&scoring=%s&ned=%s&geo=%s&topic=%s" % (SEARCH_URI, search, scoring, country, city, topic)
             else:
-                rss = "%s?output=rss&q=%s&num=50&scoring=%s&ned=%s&topic=%s" % (SEARCH_URI, search, scoring, country, topic)
+                rss = "%s?output=rss&q=%s&num=25&scoring=%s&ned=%s&topic=%s" % (SEARCH_URI, search, scoring, country, topic)
         else:
             if cat == 0:
-                rss = "%s?output=rss&num=50&scoring=%s&ned=%s&geo=%s&topic=%s" % (SEARCH_URI, scoring, country, city, topic)
+                rss = "%s?output=rss&num=25&scoring=%s&ned=%s&geo=%s&topic=%s" % (SEARCH_URI, scoring, country, city, topic)
             else:
-                rss = "%s?output=rss&num=50&scoring=%s&ned=%s&topic=%s" % (SEARCH_URI, scoring, country, topic)
+                rss = "%s?output=rss&num=25&scoring=%s&ned=%s&topic=%s" % (SEARCH_URI, scoring, country, topic)
         print(rss)
 #        try:
         feed = feedparser.parse(rss)

=== modified file 'tests/test_googlenews.py'
--- tests/test_googlenews.py	2013-03-19 01:26:33 +0000
+++ tests/test_googlenews.py	2013-03-25 13:44:20 +0000
@@ -46,9 +46,16 @@
         for s in ['query']:
             result_set = self.perform_query(s)
             results.append(result_set.results[1]['title'])
-
         self.assertEqual(results, expected_results)
 
+    def test_short_search(self):
+        self.scope_module.SEARCH_URI = 'file:tests/data/mock_googlenews_pass.rss#'
+        self.scope_module.GEOIPLOOKUP_URI = 'file:tests/data/mock_geoiplookup.js'
+        results = []
+        for s in ['qu']:
+            result_set = self.perform_query(s)
+            self.assertEqual(len(result_set.results), 0)
+
     def test_failing_search(self):
         self.scope_module.SEARCH_URI = 'file:tests/data/mock_googlenews_fail'
         self.scope_module.GEOIPLOOKUP_URI = 'file:tests/data/mock_geoiplookup.js'