From 6d1c114a88fa44feab968fbe9907851ae7980a43 Mon Sep 17 00:00:00 2001
From: "Karl O. Pinc" <kop@karlpinc.com>
Date: Sun, 15 Sep 2024 21:44:46 -0500
Subject: [PATCH] Get rid of example settings error

---
 src/pgwui_sql/exceptions.py  | 22 +++++++---------------
 src/pgwui_sql/views/sql.py   |  3 ---
 tests/test_check_settings.py | 32 +-------------------------------
 3 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/src/pgwui_sql/exceptions.py b/src/pgwui_sql/exceptions.py
index 3b893f3..99c558b 100644
--- a/src/pgwui_sql/exceptions.py
+++ b/src/pgwui_sql/exceptions.py
@@ -25,21 +25,13 @@ from pgwui_core import exceptions as core_ex
 
 # PGWUI setting and user-supplied value related exceptions
 
-class ExampleSetupError(common_ex.SetupError):
-    pass
-
-
-class ExampleOnOffAskError(ExampleSetupError):
-    def __init__(self, value):
-        super().__init__(
-            ('The "pgwui:PGWUI_SQL:example_on_off_ask" PGWUI setting '
-             ' must be "on", "off", "ask", or not present'),
-            descr=f'Got: ({value})')
-
-
-class ExampleDetailedError(ExampleSetupError):
-    def __init__(self, e, descr='', detail=''):
-        super().__init__('Detailed error', descr=descr, detail=detail)
+class NoFileError(common_ex.SetupError):
+    '''
+    Error raised when the user has checked the "Execute SQL from file"
+    checkbox, but no file was chosen
+    '''
+    def __init__(self, e, descr=''):
+        super().__init__(e, descr=descr)
 
 
 # SQL error related exception
diff --git a/src/pgwui_sql/views/sql.py b/src/pgwui_sql/views/sql.py
index dc13890..5ea0335 100644
--- a/src/pgwui_sql/views/sql.py
+++ b/src/pgwui_sql/views/sql.py
@@ -30,9 +30,6 @@ from pgwui_common.view import auth_base_view
 
 from pgwui_sql import exceptions as sql_ex
 
-# Useless usage of the imported exceptions to keep `make check` from failing
-sql_ex.ExampleOnOffAskError('42')
-
 log = logging.getLogger(__name__)
 
 
diff --git a/tests/test_check_settings.py b/tests/test_check_settings.py
index c2516e1..103a6a4 100644
--- a/tests/test_check_settings.py
+++ b/tests/test_check_settings.py
@@ -26,7 +26,6 @@ import pgwui_sql.check_settings as check_settings
 
 from pgwui_common import checkset
 from pgwui_develop import testing
-from pgwui_sql import exceptions as pgwui_sql_ex
 
 # Activiate the PGWUI pytest plugin
 pytest_plugins = ("pgwui",)
@@ -55,34 +54,7 @@ mock_boolean_settings = testing.make_mock_fixture(
     checkset, 'boolean_settings')
 
 
-# validate_example_on_off_ask()
-
-@pytest.mark.parametrize(
-    ('settings', 'error_class'), [
-        ({}, None),
-        ({'example_on_off_ask': 'on'}, None),
-        ({'example_on_off_ask': 'off'}, None),
-        ({'example_on_off_ask': 'ask'}, None),
-        ({'example_on_off_ask': 'bad'},
-         pgwui_sql_ex.ExampleOnOffAskError)])
-@pytest.mark.unittest
-def test_validate_example_on_off_ask(settings, error_class):
-    '''No error is delivered when there's no setting'''
-    errors = []
-    check_settings.validate_example_on_off_ask(errors, settings)
-
-    if error_class:
-        assert len(errors) == 1
-        assert isinstance(
-            errors[0], error_class)
-    else:
-        assert errors == []
-
-
 literal_err = 'literal column headings error'
-mock_validate_example_on_off_ask = testing.make_mock_fixture(
-    check_settings, 'validate_example_on_off_ask',
-    wraps=lambda errors, *args: errors.append(literal_err))
 
 
 # check_settings()
@@ -90,8 +62,7 @@ mock_validate_example_on_off_ask = testing.make_mock_fixture(
 @pytest.mark.unittest
 def test_check_settings(mock_unknown_settings,
                         mock_require_settings,
-                        mock_boolean_settings,
-                        mock_validate_example_on_off_ask):
+                        mock_boolean_settings):
     '''The setting checking functions are called once, the check_settings()
     call returns all the errors from each mock.
     '''
@@ -109,7 +80,6 @@ def test_check_settings(mock_unknown_settings,
     mock_unknown_settings.assert_called_once
     mock_require_settings.assert_called_once
     mock_boolean_settings.assert_called_once
-    mock_validate_example_on_off_ask.assert_called_once
 
     assert result.sort() == ([literal_err]
                              + unknown_retval
-- 
2.34.1