46b4542 · searx · git.iko.soy

searx/search.py+20−4

compare with master

unifiedsplit

@@ -57,8 +57,11 @@ class EngineRef:

57 self.category = category

58 self.from_bang = from_bang

59

60− def __str__(self):

60+ def __repr__(self):

61+ return "EngineRef({!r}, {!r}, {!r})".format(self.name, self.category, self.from_bang)

62+

63+ def __eq__(self, other):

61− return "(" + self.name + "," + self.category + "," + str(self.from_bang) + ")"

64+ return self.name == other.name and self.category == other.category and self.from_bang == other.from_bang

62

65

63

66

64class SearchQuery:

67class SearchQuery:

@@ -87,8 +90,21 @@ class SearchQuery:

87 self.timeout_limit = timeout_limit

90 self.timeout_limit = timeout_limit

88 self.external_bang = external_bang

91 self.external_bang = external_bang

89

92

90− def __str__(self):

93+ def __repr__(self):

91− return self.query + ";" + str(self.engineref_list)

94+ return "SearchQuery({!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r}, {!r})".\

95+ format(self.query, self.engineref_list, self.categories, self.lang, self.safesearch,

96+ self.pageno, self.time_range, self.timeout_limit, self.external_bang)

97+

98+ def __eq__(self, other):

99+ return self.query == other.query\

100+ and self.engineref_list == other.engineref_list\

101+ and self.categories == self.categories\

102+ and self.lang == other.lang\

103+ and self.safesearch == other.safesearch\

104+ and self.pageno == other.pageno\

105+ and self.time_range == other.time_range\

106+ and self.timeout_limit == other.timeout_limit\

107+ and self.external_bang == other.external_bang

92

108

93

109

94def send_http_request(engine, request_params):

110def send_http_request(engine, request_params):

tests/unit/test_search.py+14

@@ -21,6 +21,20 @@ TEST_ENGINES = [

21]

22

23

24+class SearchQueryTestCase(SearxTestCase):

25+

26+ def test_repr(self):

27+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')

28+ self.assertEqual(repr(s),

29+ "SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, '1', 5.0, 'g')") # noqa

30+

31+ def test_eq(self):

32+ s = SearchQuery('test', [EngineRef('bing', 'general', False)], ['general'], 'all', 0, 1, None, None, None)

33+ t = SearchQuery('test', [EngineRef('google', 'general', False)], ['general'], 'all', 0, 1, None, None, None)

34+ self.assertEqual(s, s)

35+ self.assertNotEqual(s, t)

36+

37+

24class SearchTestCase(SearxTestCase):

38class SearchTestCase(SearxTestCase):

25

39

26 @classmethod

40 @classmethod

tests/unit/test_standalone_searx.py+2−1

@@ -7,6 +7,7 @@ import sys

7from mock import Mock, patch

8from nose2.tools import params

9

10+from searx.search import SearchQuery

10from searx.testing import SearxTestCase

11from searx.testing import SearxTestCase

11

12

13

@@ -91,7 +92,7 @@ class StandaloneSearx(SearxTestCase):

91 args = sas.parse_argument(['rain', ])

92 args = sas.parse_argument(['rain', ])

92 search_q = sas.get_search_query(args)

93 search_q = sas.get_search_query(args)

93 self.assertTrue(search_q)

94 self.assertTrue(search_q)

94− self.assertEqual(str(search_q), 'rain;[]')

95+ self.assertEqual(search_q, SearchQuery('rain', [], ['general'], 'all', 0, 1, None, None, None))

95

96

96 def test_no_parsed_url(self):

97 def test_no_parsed_url(self):

97 """test no_parsed_url func"""

98 """test no_parsed_url func"""