fix unit tests

Author: tonybaloney

test/unit/test_index_unit.py

@@ -1,36 +1,58 @@
 """Unit tests for the index command."""
 
+from pathlib import Path
 from unittest import mock
 
 from wily.commands.index import index
 
 
-def get_mock_State_and_config(revs):
-    """Build a mock State and a mock config for command tests."""
-    revisions = []
-    for rev in range(revs):
-        rev_dict = {
-            "revision.key": f"abcdef{rev}",
-            "revision.author_name": f"Author {rev}",
-            "revision.message": f"Message {rev}",
-            "revision.date": rev,
-        }
-        mock_revision = mock.Mock(**rev_dict)
-        revisions.append(mock_revision)
-    mock_revisions = mock.Mock(revisions=revisions)
-    mock_state = mock.Mock(index={"git": mock_revisions}, archivers=("git",))
-    mock.seal(mock_state)
-    mock_State = mock.Mock(return_value=mock_state)
-    mock_config = mock.Mock(path="", archiver="", operator="")
-    return mock_State, mock_config
+def create_mock_rows(num_revisions):
+    """Create mock rows for WilyIndex."""
+    rows = []
+    for i in range(num_revisions):
+        rows.append({
+            "revision": f"abcdef{i}",
+            "revision_author": f"Author {i}",
+            "revision_message": f"Message {i}",
+            "revision_date": i * 1000,  # Unix timestamps
+            "path": "test.py",
+            "path_type": "file",
+        })
+    return rows
+
+
+class MockWilyIndex:
+    """Mock WilyIndex context manager."""
+
+    def __init__(self, rows):
+        self.rows = rows
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        pass
+
+    def __iter__(self):
+        return iter(self.rows)
 
 
 def test_index_without_message(capsys):
     """Test index command outputs expected data without message."""
-    mock_State, mock_config = get_mock_State_and_config(3)
+    mock_rows = create_mock_rows(3)
+    mock_idx = MockWilyIndex(mock_rows)
+
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=False)
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=False)
 
     captured = capsys.readouterr()
 
@@ -47,15 +69,23 @@ def test_index_without_message(capsys):
     assert "abcdef2" in captured.out
     assert "Author 2" in captured.out
 
-    mock_State.assert_called_once_with(config=mock_config)
-
 
 def test_index_without_message_wrapped(capsys):
     """Test index command with wrapping enabled."""
-    mock_State, mock_config = get_mock_State_and_config(3)
+    mock_rows = create_mock_rows(3)
+    mock_idx = MockWilyIndex(mock_rows)
+
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=False, wrap=True)
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=False, wrap=True)
 
     captured = capsys.readouterr()
 
@@ -69,15 +99,23 @@ def test_index_without_message_wrapped(capsys):
     assert "abcdef1" in captured.out
     assert "abcdef2" in captured.out
 
-    mock_State.assert_called_once_with(config=mock_config)
-
 
 def test_index_with_message(capsys):
     """Test index command with message column included."""
-    mock_State, mock_config = get_mock_State_and_config(3)
+    mock_rows = create_mock_rows(3)
+    mock_idx = MockWilyIndex(mock_rows)
+
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=True)
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=True)
 
     captured = capsys.readouterr()
 
@@ -92,15 +130,23 @@ def test_index_with_message(capsys):
     assert "Message 1" in captured.out
     assert "Message 2" in captured.out
 
-    mock_State.assert_called_once_with(config=mock_config)
-
 
 def test_index_with_message_wrapped(capsys):
     """Test index command with message column and wrapping."""
-    mock_State, mock_config = get_mock_State_and_config(3)
+    mock_rows = create_mock_rows(3)
+    mock_idx = MockWilyIndex(mock_rows)
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=True, wrap=True)
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
+
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=True, wrap=True)
 
     captured = capsys.readouterr()
 
@@ -112,15 +158,23 @@ def test_index_with_message_wrapped(capsys):
     # Verify data is present
     assert "abcdef0" in captured.out
 
-    mock_State.assert_called_once_with(config=mock_config)
-
 
 def test_empty_index_without_message(capsys):
     """Test index command with empty data."""
-    mock_State, mock_config = get_mock_State_and_config(0)
+    mock_rows = []
+    mock_idx = MockWilyIndex(mock_rows)
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=False)
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
+
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=False)
 
     captured = capsys.readouterr()
 
@@ -129,15 +183,23 @@ def test_empty_index_without_message(capsys):
     assert "Author" in captured.out
     assert "Date" in captured.out
 
-    mock_State.assert_called_once_with(config=mock_config)
-
 
 def test_empty_index_with_message(capsys):
     """Test index command with empty data and message column."""
-    mock_State, mock_config = get_mock_State_and_config(0)
+    mock_rows = []
+    mock_idx = MockWilyIndex(mock_rows)
 
-    with mock.patch("wily.commands.index.State", mock_State):
-        index(mock_config, include_message=True)
+    mock_config = mock.Mock()
+    mock_config.path = "/test/path"
+    mock_config.archiver = "git"
+    mock_config.operators = "raw"
+    mock_config.cache_path = "/test/.wily"
+
+    with mock.patch("wily.commands.index.list_archivers", return_value=["git"]):
+        with mock.patch("wily.commands.index.get_default_metrics_path", return_value="/test/.wily/git/metrics.parquet"):
+            with mock.patch.object(Path, "exists", return_value=True):
+                with mock.patch("wily.commands.index.WilyIndex", return_value=mock_idx):
+                    index(mock_config, include_message=True)
 
     captured = capsys.readouterr()
 
@@ -146,5 +208,3 @@ def test_empty_index_with_message(capsys):
     assert "Author" in captured.out
     assert "Message" in captured.out
     assert "Date" in captured.out
-
-    mock_State.assert_called_once_with(config=mock_config)