Fix unit test errors

Author: Iain-S

sqlsynthgen/settings.py

@@ -44,14 +44,16 @@ class Settings(BaseSettings):
             The destination database schema to use, if applicable.
     """
 
-    # Connection parameters for the source database. See also
+    src_schema: Optional[str]
+    dst_schema: Optional[str]
+
+    # DSNs for the databases. For example:
+    # postgresql://user:secret@localhost:6789/dbname
+    # See also
     # https://www.postgresql.org/docs/11/libpq-connect.html#LIBPQ-PARAMKEYWORDS
     src_dsn: Optional[str]
     dst_dsn: Optional[str]
 
-    src_schema: Optional[str]
-    dst_schema: Optional[str]
-
     @validator("src_dsn")
     def validate_src_dsn(cls, dsn: Optional[str], values: Any) -> Optional[str]:
         """Create and validate the source DB DSN."""

tests/test_functional.py

@@ -36,14 +36,8 @@ class FunctionalTestCase(RequiresDBTestCase):
     env = os.environ.copy()
     env = {
         **env,
-        "src_host_name": "localhost",
-        "src_user_name": "postgres",
-        "src_password": "password",
-        "src_db_name": "src",
-        "dst_host_name": "localhost",
-        "dst_user_name": "postgres",
-        "dst_password": "password",
-        "dst_db_name": "dst",
+        "src_dsn": "postgresql://postgres:password@localhost/src",
+        "dst_dsn": "postgresql://postgres:password@localhost/dst",
     }
 
     def setUp(self) -> None:

tests/test_remove.py

@@ -31,7 +31,7 @@ def test_remove_db_data(
     @patch("sqlsynthgen.remove.get_settings")
     def test_remove_db_data_raises(self, mock_get: MagicMock) -> None:
         """Check that remove_db_data raises if dst DSN is missing."""
-        mock_get.return_value = Settings(dst_user_name=None, _env_file=None)
+        mock_get.return_value = Settings(dst_dsn=None, _env_file=None)
         with self.assertRaises(AssertionError) as context_manager:
             remove_db_data(example_orm, remove_ssg)
         self.assertEqual(
@@ -56,7 +56,7 @@ def test_remove_db_vocab(
     @patch("sqlsynthgen.remove.get_settings")
     def test_remove_db_vocab_raises(self, mock_get: MagicMock) -> None:
         """Check that remove_db_vocab raises if dst DSN is missing."""
-        mock_get.return_value = Settings(dst_user_name=None, _env_file=None)
+        mock_get.return_value = Settings(dst_dsn=None, _env_file=None)
         with self.assertRaises(AssertionError) as context_manager:
             remove_db_vocab(example_orm, remove_ssg)
         self.assertEqual(
@@ -75,7 +75,7 @@ def test_remove_tables(self, mock_engine: MagicMock, _: MagicMock) -> None:
     @patch("sqlsynthgen.remove.get_settings")
     def test_remove_db_tables_raises(self, mock_get: MagicMock) -> None:
         """Check that remove_db_tables raises if dst DSN is missing."""
-        mock_get.return_value = Settings(dst_user_name=None, _env_file=None)
+        mock_get.return_value = Settings(dst_dsn=None, _env_file=None)
         with self.assertRaises(AssertionError) as context_manager:
             remove_db_tables(example_orm)
         self.assertEqual(

tests/utils.py

@@ -18,14 +18,8 @@ def get_test_settings() -> settings.Settings:
     """Get a Settings object that ignores .env files and environment variables."""
 
     return settings.Settings(
-        src_host_name="shost",
-        src_user_name="suser",
-        src_password="spassword",
-        src_db_name="sdbname",
-        dst_host_name="dhost",
-        dst_user_name="duser",
-        dst_password="dpassword",
-        dst_db_name="ddbname",
+        src_dsn="postgresql://suser:spassword@shost:5432/sdbname",
+        dst_dsn="postgresql://duser:dpassword@dhost:5432/ddbname",
         # To stop any local .env files influencing the test
         _env_file=None,
     )