summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/unit/engines/test_command.py181
-rw-r--r--tests/unit/test_engine_mariadb_server.py30
-rw-r--r--tests/unit/test_results.py12
-rw-r--r--tests/unit/test_webapp.py5
4 files changed, 97 insertions, 131 deletions
diff --git a/tests/unit/engines/test_command.py b/tests/unit/engines/test_command.py
index e9a88ffe1..eab530ff4 100644
--- a/tests/unit/engines/test_command.py
+++ b/tests/unit/engines/test_command.py
@@ -2,6 +2,8 @@
# pylint: disable=missing-module-docstring,disable=missing-class-docstring,invalid-name
from searx.engines import command as command_engine
+from searx.result_types import KeyValue
+
from tests import SearxTestCase
@@ -12,14 +14,15 @@ class TestCommandEngine(SearxTestCase):
ls_engine.command = ['seq', '{{QUERY}}']
ls_engine.delimiter = {'chars': ' ', 'keys': ['number']}
expected_results = [
- {'number': '1', 'template': 'key-value.html'},
- {'number': '2', 'template': 'key-value.html'},
- {'number': '3', 'template': 'key-value.html'},
- {'number': '4', 'template': 'key-value.html'},
- {'number': '5', 'template': 'key-value.html'},
+ KeyValue(kvmap={'number': 1}),
+ KeyValue(kvmap={'number': 2}),
+ KeyValue(kvmap={'number': 3}),
+ KeyValue(kvmap={'number': 4}),
+ KeyValue(kvmap={'number': 5}),
]
results = ls_engine.search('5', {'pageno': 1})
- self.assertEqual(results, expected_results)
+ for i, expected in enumerate(expected_results):
+ self.assertEqual(results[i].kvmap["number"], str(expected.kvmap["number"]))
def test_delimiter_parsing(self):
searx_logs = '''DEBUG:searx.webapp:static directory is /home/n/p/searx/searx/static
@@ -39,94 +42,85 @@ INFO:werkzeug: * Debugger PIN: 299-578-362'''
echo_engine.command = ['echo', searx_logs]
echo_engine.delimiter = {'chars': ':', 'keys': ['level', 'component', 'message']}
- expected_results_by_page = [
- [
- {
- 'component': 'searx.webapp',
- 'message': 'static directory is /home/n/p/searx/searx/static',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.webapp',
- 'message': 'templates directory is /home/n/p/searx/searx/templates',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'soundcloud engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'wolframalpha engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'locate engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'regex search in files engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'urllib3.connectionpool',
- 'message': 'Starting new HTTPS connection (1): www.wolframalpha.com',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'urllib3.connectionpool',
- 'message': 'Starting new HTTPS connection (1): soundcloud.com',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'find engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'searx.engines',
- 'message': 'pattern search in files engine: Starting background initialization',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- ],
- [
- {
- 'component': 'searx.webapp',
- 'message': 'starting webserver on 127.0.0.1:8888',
- 'template': 'key-value.html',
- 'level': 'DEBUG',
- },
- {
- 'component': 'werkzeug',
- 'message': ' * Debugger is active!',
- 'template': 'key-value.html',
- 'level': 'WARNING',
- },
- {
- 'component': 'werkzeug',
- 'message': ' * Debugger PIN: 299-578-362',
- 'template': 'key-value.html',
- 'level': 'INFO',
- },
- ],
+ page1 = [
+ {
+ 'component': 'searx.webapp',
+ 'message': 'static directory is /home/n/p/searx/searx/static',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.webapp',
+ 'message': 'templates directory is /home/n/p/searx/searx/templates',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'soundcloud engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'wolframalpha engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'locate engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'regex search in files engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'urllib3.connectionpool',
+ 'message': 'Starting new HTTPS connection (1): www.wolframalpha.com',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'urllib3.connectionpool',
+ 'message': 'Starting new HTTPS connection (1): soundcloud.com',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'find engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'searx.engines',
+ 'message': 'pattern search in files engine: Starting background initialization',
+ 'level': 'DEBUG',
+ },
+ ]
+ page2 = [
+ {
+ 'component': 'searx.webapp',
+ 'message': 'starting webserver on 127.0.0.1:8888',
+ 'level': 'DEBUG',
+ },
+ {
+ 'component': 'werkzeug',
+ 'message': ' * Debugger is active!',
+ 'level': 'WARNING',
+ },
+ {
+ 'component': 'werkzeug',
+ 'message': ' * Debugger PIN: 299-578-362',
+ 'level': 'INFO',
+ },
]
+ page1 = [KeyValue(kvmap=row) for row in page1]
+ page2 = [KeyValue(kvmap=row) for row in page2]
+
+ expected_results_by_page = [page1, page2]
for i in [0, 1]:
results = echo_engine.search('', {'pageno': i + 1})
- self.assertEqual(results, expected_results_by_page[i])
+ page = expected_results_by_page[i]
+ for i, expected in enumerate(page):
+ self.assertEqual(expected.kvmap["message"], str(results[i].kvmap["message"]))
def test_regex_parsing(self):
txt = '''commit 35f9a8c81d162a361b826bbcd4a1081a4fbe76a7
@@ -165,26 +159,25 @@ commit '''
'author': ' Noémi Ványi <sitbackandwait@gmail.com>',
'date': 'Date: Tue Oct 15 11:31:33 2019 +0200',
'message': '\n\nfirst interesting message',
- 'template': 'key-value.html',
},
{
'commit': '6c3c206316153ccc422755512bceaa9ab0b14faa',
'author': ' Noémi Ványi <sitbackandwait@gmail.com>',
'date': 'Date: Mon Oct 14 17:10:08 2019 +0200',
'message': '\n\nsecond interesting message',
- 'template': 'key-value.html',
},
{
'commit': 'd8594d2689b4d5e0d2f80250223886c3a1805ef5',
'author': ' Noémi Ványi <sitbackandwait@gmail.com>',
'date': 'Date: Mon Oct 14 14:45:05 2019 +0200',
'message': '\n\nthird interesting message',
- 'template': 'key-value.html',
},
]
+ expected_results = [KeyValue(kvmap=kvmap) for kvmap in expected_results]
results = git_log_engine.search('', {'pageno': 1})
- self.assertEqual(results, expected_results)
+ for i, expected in enumerate(expected_results):
+ self.assertEqual(expected.kvmap["message"], str(results[i].kvmap["message"]))
def test_working_dir_path_query(self):
ls_engine = command_engine
diff --git a/tests/unit/test_engine_mariadb_server.py b/tests/unit/test_engine_mariadb_server.py
deleted file mode 100644
index 983b0ea06..000000000
--- a/tests/unit/test_engine_mariadb_server.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# SPDX-License-Identifier: AGPL-3.0-or-later
-# pylint: disable=missing-module-docstring,disable=missing-class-docstring,invalid-name
-
-from unittest.mock import MagicMock, Mock
-
-from searx.engines import mariadb_server
-from tests import SearxTestCase
-
-
-class MariadbServerTests(SearxTestCase):
-
- def test_init_no_query_str_raises(self):
- self.assertRaises(ValueError, lambda: mariadb_server.init({}))
-
- def test_init_non_select_raises(self):
- self.assertRaises(ValueError, lambda: mariadb_server.init({'query_str': 'foobar'}))
-
- def test_search_returns_results(self):
- test_string = 'FOOBAR'
- cursor_mock = MagicMock()
- with cursor_mock as setup: # pylint: disable=not-context-manager
- setup.__iter__ = Mock(return_value=iter([{test_string, 1}]))
- setup.description = [[test_string]]
- conn_mock = Mock()
- conn_mock.cursor.return_value = cursor_mock
- mariadb_server._connection = conn_mock # pylint: disable=protected-access
- results = mariadb_server.search(test_string, {'pageno': 1})
- self.assertEqual(1, len(results))
- self.assertIn(test_string, results[0])
- self.assertEqual(mariadb_server.result_template, results[0]['template'])
diff --git a/tests/unit/test_results.py b/tests/unit/test_results.py
index 6560f7b5c..45caf1d49 100644
--- a/tests/unit/test_results.py
+++ b/tests/unit/test_results.py
@@ -23,8 +23,11 @@ class ResultContainerTestCase(SearxTestCase):
container.extend("google", [result])
container.close()
- self.assertEqual(container.results_length(), 1)
- self.assertIn(LegacyResult(result), container.get_ordered_results())
+ self.assertEqual(len(container.get_ordered_results()), 1)
+
+ res = LegacyResult(result)
+ res.normalize_result_fields()
+ self.assertIn(res, container.get_ordered_results())
def test_one_suggestion(self):
result = dict(suggestion="lorem ipsum ..")
@@ -33,7 +36,7 @@ class ResultContainerTestCase(SearxTestCase):
container.extend("duckduckgo", [result])
container.close()
- self.assertEqual(container.results_length(), 0)
+ self.assertEqual(len(container.get_ordered_results()), 0)
self.assertEqual(len(container.suggestions), 1)
self.assertIn(result["suggestion"], container.suggestions)
@@ -42,6 +45,7 @@ class ResultContainerTestCase(SearxTestCase):
result = LegacyResult(
url="https://example.org", title="very long title, lorem ipsum", content="Lorem ipsum dolor sit amet .."
)
+ result.normalize_result_fields()
eng1 = dict(url=result.url, title="short title", content=result.content, engine="google")
eng2 = dict(url="http://example.org", title=result.title, content="lorem ipsum", engine="duckduckgo")
@@ -50,7 +54,7 @@ class ResultContainerTestCase(SearxTestCase):
container.close()
result_list = container.get_ordered_results()
- self.assertEqual(container.results_length(), 1)
+ self.assertEqual(len(container.get_ordered_results()), 1)
self.assertIn(result, result_list)
self.assertEqual(result_list[0].title, result.title)
self.assertEqual(result_list[0].content, result.content)
diff --git a/tests/unit/test_webapp.py b/tests/unit/test_webapp.py
index e8f4fcdcd..35a41302c 100644
--- a/tests/unit/test_webapp.py
+++ b/tests/unit/test_webapp.py
@@ -148,11 +148,10 @@ class ViewsTestCase(SearxTestCase): # pylint: disable=too-many-public-methods
def test_search_csv(self):
result = self.client.post('/search', data={'q': 'test', 'format': 'csv'})
-
self.assertEqual(
b'title,url,content,host,engine,score,type\r\n'
- b'First Test,http://first.test.xyz,first test content,first.test.xyz,startpage,,result\r\n' # noqa
- b'Second Test,http://second.test.xyz,second test content,second.test.xyz,youtube,,result\r\n', # noqa
+ + b'First Test,http://first.test.xyz,first test content,first.test.xyz,startpage,0,result\r\n'
+ + b'Second Test,http://second.test.xyz,second test content,second.test.xyz,youtube,0,result\r\n',
result.data,
)
generated by cgit v1.2.3 (git 2.25.1) at 2026-03-03 20:08:44 +0000