Commit e32c9129 authored by Jan Reimes's avatar Jan Reimes
Browse files

tests: update imports for domain model migration 

- Update all test imports to reference domain packages directly
- Fix conftest to import MeetingMetadata, TDocMetadata from respective modules
- Update cache_dir parameters to cache_file where appropriate
- Remove noqa comments for linter suppressions (follow coding standards)
- Update mock fixture return types in specs tests
- Fix EOL environment variable names to use TDC_ prefix (EOL_USERNAME -> TDC_EOL_USERNAME)
- Add type hints to test parameters (mock_db, monkeypatch)
- Update cache file path handling in portal auth tests
parent ca346eaa

tests/conftest.py

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ import pytest 


from tdoc_crawler.config import CacheManager, register_cache_manager

from tdoc_crawler.database import TDocDatabase

from tdoc_crawler.models import MeetingMetadata, TDocMetadata, WorkingGroup

from tdoc_crawler.meetings.models import MeetingMetadata

from tdoc_crawler.models import WorkingGroup

from tdoc_crawler.tdocs.models import TDocMetadata





@pytest.fixture

tests/test_checkout.py

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ from unittest.mock import Mock, patch 


import pytest



from tdoc_crawler.models import TDocMetadata

from tdoc_crawler.tdocs.models import TDocMetadata

from tdoc_crawler.tdocs.operations.checkout import checkout_tdoc, get_checked_out_tdocs, get_checkout_path

tests/test_cli.py

+20 −20
Original line number Diff line number Diff line
@@ -11,7 +11,8 @@ from typer.testing import CliRunner 


from tdoc_crawler.cli import app

from tdoc_crawler.database import TDocDatabase

from tdoc_crawler.models import TDocMetadata, WorkingGroup

from tdoc_crawler.models import WorkingGroup

from tdoc_crawler.tdocs.models import TDocMetadata

from tdoc_crawler.tdocs.operations.crawl import TDocCrawlResult

from tdoc_crawler.tdocs.operations.fetch import FetchMissingResult
@@ -91,7 +92,7 @@ class TestCrawlMeetingsCommand: 
    """Tests for crawl-meetings command."""



    @patch("tdoc_crawler.cli.app.MeetingCrawler")

    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_crawl_meetings_basic(

        self,

        mock_db_class: MagicMock,
@@ -99,9 +100,9 @@ class TestCrawlMeetingsCommand: 
        test_cache_dir: Path,

    ) -> None:

        """Test basic crawl-meetings command execution."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.log_crawl_start.return_value = "1"

        mock_db.log_crawl_start.return_value = 1



        mock_crawler = MagicMock()

        mock_crawler_class.return_value = mock_crawler
@@ -215,14 +216,14 @@ class TestQueryCommand: 
class TestQueryMeetingsCommand:

    """Tests for query-meetings command."""



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_no_results(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with no results."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -234,14 +235,14 @@ class TestQueryMeetingsCommand: 
        assert result.exit_code == 0

        assert "No meetings found" in result.stdout



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_with_subgroup_filter(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with subgroup filter."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -255,14 +256,14 @@ class TestQueryMeetingsCommand: 
        call_args = mock_db.query_meetings.call_args[0][0]

        assert call_args.subgroups == ["S4"]



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_with_subgroup_alias(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with subgroup alias (S4 -> SA4)."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -276,14 +277,14 @@ class TestQueryMeetingsCommand: 
        call_args = mock_db.query_meetings.call_args[0][0]

        assert "S4" in call_args.subgroups



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_with_plenary_alias(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with plenary subgroup alias (RP -> RAN Plenary)."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -297,14 +298,14 @@ class TestQueryMeetingsCommand: 
        call_args = mock_db.query_meetings.call_args[0][0]

        assert "RP" in call_args.subgroups



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_with_working_group_alias(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with working group alias (SP -> SA)."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -318,14 +319,14 @@ class TestQueryMeetingsCommand: 
        call_args = mock_db.query_meetings.call_args[0][0]

        assert WorkingGroup.SA in call_args.working_groups



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_query_meetings_combined_filters(

        self,

        mock_db_class: MagicMock,

        test_cache_dir: Path,

    ) -> None:

        """Test query-meetings with combined working group and subgroup filters."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -780,14 +781,14 @@ class TestEnvironmentVariables: 
        config = call_args[0]

        assert config.workers == 8



    @patch("tdoc_crawler.cli.app.TDocDatabase")

    @patch("tdoc_crawler.cli.app.SpecDatabase")

    def test_env_var_working_group(

        self,

        mock_db_class: MagicMock,

        monkeypatch,

    ) -> None:

        """Test that TDC_WORKING_GROUP environment variable filters by working group."""

        mock_db = MagicMock(spec=TDocDatabase)

        mock_db = MagicMock()

        mock_db_class.return_value.__enter__.return_value = mock_db

        mock_db.query_meetings.return_value = []
@@ -824,8 +825,7 @@ class TestEnvironmentVariables: 
        monkeypatch,

    ) -> None:

        """Test that CLI arguments override environment variables."""

        # Set environment variable for verbose mode

        monkeypatch.setenv("TDC_VERBOSE", "false")

        # Note: TDC_VERBOSE has been removed - verbose mode is now controlled by --verbose flag only



        # But override with CLI argument

        result = runner.invoke(app, ["--help"])

tests/test_crawler.py

+4 −2
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ from bs4 import BeautifulSoup 


from tdoc_crawler.constants.patterns import EXCLUDED_DIRS, TDOC_PATTERN

from tdoc_crawler.database import TDocDatabase

from tdoc_crawler.models import MeetingMetadata, QueryConfig, TDocCrawlConfig, WorkingGroup

from tdoc_crawler.meetings.models import MeetingMetadata

from tdoc_crawler.models import WorkingGroup

from tdoc_crawler.parsers.meetings import parse_meeting_row, parse_single_date

from tdoc_crawler.tdocs import TDocCrawler

from tdoc_crawler.tdocs.models import QueryConfig, TDocCrawlConfig

from tdoc_crawler.tdocs.operations import TDocCrawler





class TestTDocCrawler:

tests/test_database.py

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,9 @@ import pytest 
from conftest import insert_sample_meetings



from tdoc_crawler.database import DatabaseError, TDocDatabase

from tdoc_crawler.models import MeetingMetadata, MeetingQueryConfig, QueryConfig, SortOrder, TDocMetadata, WorkingGroup

from tdoc_crawler.meetings.models import MeetingMetadata, MeetingQueryConfig

from tdoc_crawler.models import SortOrder, WorkingGroup

from tdoc_crawler.tdocs.models import QueryConfig, TDocMetadata





class TestTDocDatabase: