test: keep new test setup branch-free and constants first

Author: kvlonge

tests/e2e/src/sqlbuild/cli/commands/main/build/test_materialization_type_change.py

@@ -23,6 +23,17 @@
     'name = "orders"\nadapter = "duckdb"\n[connection]\ndatabase = "orders.duckdb"\n'
 )
 _MODEL_PATH: str = "models/order_totals.sql"
+_SNAPSHOT_PROJECT_TOML: str = (
+    'name = "customers"\nadapter = "duckdb"\n[connection]\ndatabase = "customers.duckdb"\n'
+    '[snapshots]\ncurrent_state_full_refresh = "allow"\n'
+)
+_RAW_CUSTOMERS_YML: str = (
+    "sources:\n  - name: raw_customers\n    description: Raw customers.\n"
+    "    schema: main\n    table: raw_customers\n"
+)
+_CUSTOMER_SNAPSHOT_SQL: str = (
+    'SELECT customer_id, plan, updated_at FROM __source("raw_customers")\n'
+)
 
 
 @pytest.mark.parametrize(
@@ -78,19 +89,6 @@ def test_given_built_model_when_materialization_changes_then_build_replaces_rela
     assert rows == [(1, 250)], test_case.description
 
 
-_SNAPSHOT_PROJECT_TOML: str = (
-    'name = "customers"\nadapter = "duckdb"\n[connection]\ndatabase = "customers.duckdb"\n'
-    '[snapshots]\ncurrent_state_full_refresh = "allow"\n'
-)
-_RAW_CUSTOMERS_YML: str = (
-    "sources:\n  - name: raw_customers\n    description: Raw customers.\n"
-    "    schema: main\n    table: raw_customers\n"
-)
-_CUSTOMER_SNAPSHOT_SQL: str = (
-    'SELECT customer_id, plan, updated_at FROM __source("raw_customers")\n'
-)
-
-
 @pytest.mark.parametrize(
     "test_case",
     [

tests/unit/src/sqlbuild/adapters/motherduck/_test_types.py

@@ -31,4 +31,4 @@ class MotherDuckConnectErrorTestCase:
     description: str
     connect_error: str
     expected_error_type: str
-    expected_help_fragment: str | None
+    expected_help: str | None

tests/unit/src/sqlbuild/adapters/motherduck/helpers.py

@@ -26,25 +26,44 @@ class FakeDuckDbModule:
     Error: type[Exception] = FakeDuckDbError
     __version__: str = "2.0.0"
 
-    def __init__(self, *, connect_error: str | None = None) -> None:
+    def __init__(self) -> None:
         self.connected_databases: list[str] = []
         self.connection: FakeDuckDbConnection = FakeDuckDbConnection()
-        self.connect_error: str | None = connect_error
 
     def connect(self, *, database: str) -> FakeDuckDbConnection:
         self.connected_databases.append(database)
-        if self.connect_error is not None:
-            raise FakeDuckDbError(self.connect_error)
         return self.connection
 
 
-def install_fake_duckdb_module(
-    monkeypatch: Any, *, connect_error: str | None = None
-) -> FakeDuckDbModule:
+class FailingFakeDuckDbModule(FakeDuckDbModule):
+    """Module double whose duckdb.connect raises a DuckDB error."""
+
+    def __init__(self, *, connect_error: str) -> None:
+        super().__init__()
+        self.connect_error: str = connect_error
+
+    def connect(self, *, database: str) -> FakeDuckDbConnection:
+        self.connected_databases.append(database)
+        raise FakeDuckDbError(self.connect_error)
+
+
+def install_failing_fake_duckdb_module(
+    monkeypatch: Any, *, connect_error: str
+) -> FailingFakeDuckDbModule:
+    """Install a fake duckdb module whose connect fails with the given message."""
+
+    import sys
+
+    fake_module: FailingFakeDuckDbModule = FailingFakeDuckDbModule(connect_error=connect_error)
+    monkeypatch.setitem(sys.modules, "duckdb", fake_module)
+    return fake_module
+
+
+def install_fake_duckdb_module(monkeypatch: Any) -> FakeDuckDbModule:
     """Install a fake duckdb module for adapter connection tests."""
 
     import sys
 
-    fake_module: FakeDuckDbModule = FakeDuckDbModule(connect_error=connect_error)
+    fake_module: FakeDuckDbModule = FakeDuckDbModule()
     monkeypatch.setitem(sys.modules, "duckdb", fake_module)
     return fake_module

tests/unit/src/sqlbuild/adapters/motherduck/test_client.py

@@ -3,6 +3,7 @@
 import pytest
 
 from sqlbuild.adapters.motherduck.classes.motherduck_adapter import MotherDuckAdapter
+from sqlbuild.adapters.motherduck.constants import MOTHERDUCK_UNSUPPORTED_DUCKDB_HELP
 from tests.unit.src.sqlbuild.adapters.motherduck._test_types import (
     MotherDuckAdapterDefaultsTestCase,
     MotherDuckConnectErrorTestCase,
@@ -11,6 +12,7 @@
 )
 from tests.unit.src.sqlbuild.adapters.motherduck.helpers import (
     FakeDuckDbModule,
+    install_failing_fake_duckdb_module,
     install_fake_duckdb_module,
 )
 
@@ -68,13 +70,13 @@ def test_given_connection_config_when_connecting_then_uses_motherduck_database(
                 '"Your DuckDB version (v2.0.0) is not yet supported by MotherDuck."'
             ),
             expected_error_type="AdapterUserError",
-            expected_help_fragment="stay on the last SQLBuild release that supports DuckDB 1.5",
+            expected_help=MOTHERDUCK_UNSUPPORTED_DUCKDB_HELP,
         ),
         MotherDuckConnectErrorTestCase(
             description="any other connection error is raised unchanged",
             connect_error="IO Error: unauthorized",
             expected_error_type="FakeDuckDbError",
-            expected_help_fragment=None,
+            expected_help=None,
         ),
     ],
     ids=lambda case: case.description,
@@ -84,17 +86,13 @@ def test_given_failing_motherduck_connect_when_connecting_then_unsupported_versi
     monkeypatch: pytest.MonkeyPatch,
 ) -> None:
     adapter: MotherDuckAdapter = MotherDuckAdapter()
-    _ = install_fake_duckdb_module(monkeypatch, connect_error=test_case.connect_error)
+    _ = install_failing_fake_duckdb_module(monkeypatch, connect_error=test_case.connect_error)
 
     with pytest.raises(Exception) as raised:
         adapter.connect({"database": "md:analytics"})
 
     assert type(raised.value).__name__ == test_case.expected_error_type
-    help_text: object = getattr(raised.value, "help", None)
-    if test_case.expected_help_fragment is None:
-        assert help_text is None
-    else:
-        assert isinstance(help_text, str) and test_case.expected_help_fragment in help_text
+    assert getattr(raised.value, "help", None) == test_case.expected_help
 
 
 @pytest.mark.parametrize(