diff options
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/test_preferences.py | 19 | ||||
| -rw-r--r-- | tests/unit/test_query.py | 14 |
2 files changed, 7 insertions, 26 deletions
diff --git a/tests/unit/test_preferences.py b/tests/unit/test_preferences.py index 1ffed5c1a..a69c45178 100644 --- a/tests/unit/test_preferences.py +++ b/tests/unit/test_preferences.py @@ -1,7 +1,6 @@ from searx.preferences import ( EnumStringSetting, MapSetting, - MissingArgumentException, SearchLanguageSetting, MultipleChoiceSetting, PluginsSetting, @@ -19,10 +18,6 @@ class PluginStub: class TestSettings(SearxTestCase): # map settings - def test_map_setting_invalid_initialization(self): - with self.assertRaises(MissingArgumentException): - MapSetting(3, wrong_argument={'0': 0}) - def test_map_setting_invalid_default_value(self): with self.assertRaises(ValidationException): MapSetting(3, map={'dog': 1, 'bat': 2}) @@ -43,9 +38,6 @@ class TestSettings(SearxTestCase): self.assertEqual(setting.get_value(), 2) # enum settings - def test_enum_setting_invalid_initialization(self): - with self.assertRaises(MissingArgumentException): - EnumStringSetting('cat', wrong_argument=[0, 1, 2]) def test_enum_setting_invalid_default_value(self): with self.assertRaises(ValidationException): @@ -67,9 +59,6 @@ class TestSettings(SearxTestCase): self.assertEqual(setting.get_value(), 2) # multiple choice settings - def test_multiple_setting_invalid_initialization(self): - with self.assertRaises(MissingArgumentException): - MultipleChoiceSetting(['2'], wrong_argument=['0', '1', '2']) def test_multiple_setting_invalid_default_value(self): with self.assertRaises(ValidationException): @@ -115,15 +104,15 @@ class TestSettings(SearxTestCase): def test_plugins_setting_all_default_enabled(self): plugin1 = PluginStub('plugin1', True) plugin2 = PluginStub('plugin2', True) - setting = PluginsSetting(['3'], choices=[plugin1, plugin2]) - self.assertEqual(setting.get_enabled(), set(['plugin1', 'plugin2'])) + setting = PluginsSetting(['3'], plugins=[plugin1, plugin2]) + self.assertEqual(set(setting.get_enabled()), set(['plugin1', 'plugin2'])) def test_plugins_setting_few_default_enabled(self): plugin1 = PluginStub('plugin1', True) plugin2 = PluginStub('plugin2', False) plugin3 = PluginStub('plugin3', True) - setting = PluginsSetting('name', choices=[plugin1, plugin2, plugin3]) - self.assertEqual(setting.get_enabled(), set(['plugin1', 'plugin3'])) + setting = PluginsSetting('name', plugins=[plugin1, plugin2, plugin3]) + self.assertEqual(set(setting.get_enabled()), set(['plugin1', 'plugin3'])) class TestPreferences(SearxTestCase): diff --git a/tests/unit/test_query.py b/tests/unit/test_query.py index 9a53f8f47..05fcafe30 100644 --- a/tests/unit/test_query.py +++ b/tests/unit/test_query.py @@ -230,13 +230,12 @@ class TestExternalBangParser(SearxTestCase): class TestBang(SearxTestCase): SPECIFIC_BANGS = ['!dummy_engine', '!du', '!general'] - NOT_SPECIFIC_BANGS = ['?dummy_engine', '?du', '?general'] THE_QUERY = 'the query' def test_bang(self): load_engines(TEST_ENGINES) - for bang in TestBang.SPECIFIC_BANGS + TestBang.NOT_SPECIFIC_BANGS: + for bang in TestBang.SPECIFIC_BANGS: with self.subTest(msg="Check bang", bang=bang): query_text = TestBang.THE_QUERY + ' ' + bang query = RawTextQuery(query_text, []) @@ -252,13 +251,6 @@ class TestBang(SearxTestCase): query = RawTextQuery(query_text, []) self.assertTrue(query.specific) - def test_not_specific(self): - for bang in TestBang.NOT_SPECIFIC_BANGS: - with self.subTest(msg="Check bang is not specific", bang=bang): - query_text = TestBang.THE_QUERY + ' ' + bang - query = RawTextQuery(query_text, []) - self.assertFalse(query.specific) - def test_bang_not_found(self): load_engines(TEST_ENGINES) query = RawTextQuery('the query !bang_not_found', []) @@ -278,5 +270,5 @@ class TestBang(SearxTestCase): query = RawTextQuery('the query !', []) self.assertEqual(query.autocomplete_list, ['!images', '!wikipedia', '!osm']) - query = RawTextQuery('the query ?', ['osm']) - self.assertEqual(query.autocomplete_list, ['?images', '?wikipedia']) + query = RawTextQuery('the query !', ['osm']) + self.assertEqual(query.autocomplete_list, ['!images', '!wikipedia']) |