jandieman/searxng
2
0
Fork 0
mirror of https://github.com/searxng/searxng.git synced 2025-12-22 19:50:00 +00:00
Code Issues Projects Releases Wiki Activity

[fix] float operations in calculator plugin

Browse Source 
This patch adds an additional *isinstance* check within the ast parser to check
for float along with int, fixing the underlying issue.

Co-Authored: Markus Heiser <markus.heiser@darmarit.de>
This commit is contained in:
Grant Lanham
2024-10-05 16:10:56 +02:00
committed by Markus Heiser
parent d448def1a6
commit 3e87354f0e
4 changed files with 51 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
tests/unit/test_plugin_calculator.py
View File

@@ -42,20 +42,35 @@ class PluginCalculator(SearxTestCase): # pylint: disable=missing-class-docstrin
@parameterized.expand(
[
"1+1",
"1-1",
"1*1",
"1/1",
"1**1",
"1^1",
("1+1", "2", "en-US"),
("1-1", "0", "en-US"),
("1*1", "1", "en-US"),
("1/1", "1", "en-US"),
("1**1", "1", "en-US"),
("1^1", "1", "en-US"),
("1,000.0+1,000.0", "2,000", "en-US"),
("1.0+1.0", "2", "en-US"),
("1.0-1.0", "0", "en-US"),
("1.0*1.0", "1", "en-US"),
("1.0/1.0", "1", "en-US"),
("1.0**1.0", "1", "en-US"),
("1.0^1.0", "1", "en-US"),
("1.000,0+1.000,0", "2.000", "de-DE"),
("1,0+1,0", "2", "de-DE"),
("1,0-1,0", "0", "de-DE"),
("1,0*1,0", "1", "de-DE"),
("1,0/1,0", "1", "de-DE"),
("1,0**1,0", "1", "de-DE"),
("1,0^1,0", "1", "de-DE"),
]
)
def test_int_operations(self, operation):
def test_localized_query(self, operation: str, contains_result: str, lang: str):
request = Mock(remote_addr='127.0.0.1')
search = get_search_mock(query=operation, pageno=1)
search = get_search_mock(query=operation, lang=lang, pageno=1)
result = self.store.call(self.store.plugins, 'post_search', request, search)
self.assertTrue(result)
self.assertIn('calculate', search.result_container.answers)
self.assertIn(contains_result, search.result_container.answers['calculate']['answer'])
@parameterized.expand(
[

3
tests/unit/test_plugins.py
View File

@@ -1,12 +1,15 @@
# SPDX-License-Identifier: AGPL-3.0-or-later
# pylint: disable=missing-module-docstring
import babel
from mock import Mock
from searx import plugins
from tests import SearxTestCase
def get_search_mock(query, **kwargs):
lang = kwargs.get("lang", "en-US")
kwargs["locale"] = babel.Locale.parse(lang, sep="-")
return Mock(search_query=Mock(query=query, **kwargs), result_container=Mock(answers={}))

2
tests/unit/test_webapp.py
View File

@@ -4,6 +4,7 @@
import logging
import json
from urllib.parse import ParseResult
import babel
from mock import Mock
from searx.results import Timing
@@ -82,6 +83,7 @@ class ViewsTestCase(SearxTestCase): # pylint: disable=missing-class-docstring,
redirect_url=None,
engine_data={},
)
search_self.search_query.locale = babel.Locale.parse("en-US", sep='-')
self.setattr4test(Search, 'search', search_mock)