Update tests for entries schema

src/tests/test_backup_restore.py

@@ -17,7 +17,7 @@ def test_backup_restore_workflow(monkeypatch):
         vault, enc_mgr = create_vault(fp_dir, TEST_SEED, TEST_PASSWORD)
         backup_mgr = BackupManager(fp_dir)
 
-        index_file = fp_dir / "seedpass_passwords_db.json.enc"
+        index_file = fp_dir / "seedpass_entries_db.json.enc"
 
         data1 = {
             "schema_version": 2,
@@ -30,7 +30,7 @@ def test_backup_restore_workflow(monkeypatch):
 
         monkeypatch.setattr(time, "time", lambda: 1111)
         backup_mgr.create_backup()
-        backup1 = fp_dir / "backups" / "passwords_db_backup_1111.json.enc"
+        backup1 = fp_dir / "backups" / "entries_db_backup_1111.json.enc"
         assert backup1.exists()
         assert backup1.stat().st_mode & 0o777 == 0o600
 
@@ -45,7 +45,7 @@ def test_backup_restore_workflow(monkeypatch):
 
         monkeypatch.setattr(time, "time", lambda: 2222)
         backup_mgr.create_backup()
-        backup2 = fp_dir / "backups" / "passwords_db_backup_2222.json.enc"
+        backup2 = fp_dir / "backups" / "entries_db_backup_2222.json.enc"
         assert backup2.exists()
         assert backup2.stat().st_mode & 0o777 == 0o600
 

src/tests/test_encryption_checksum.py

@@ -21,8 +21,8 @@ def test_encryption_checksum_workflow():
         manager.save_json_data(data)
         manager.update_checksum()
 
-        enc_file = tmp_path / "seedpass_passwords_db.json.enc"
-        chk_file = tmp_path / "seedpass_passwords_db.json_checksum.txt"
+        enc_file = tmp_path / "seedpass_entries_db.json.enc"
+        chk_file = tmp_path / "seedpass_entries_db.json_checksum.txt"
 
         checksum = chk_file.read_text().strip()
         assert re.fullmatch(r"[0-9a-f]{64}", checksum)

src/tests/test_encryption_files.py

@@ -20,7 +20,7 @@ def test_json_save_and_load_round_trip():
         loaded = manager.load_json_data()
         assert loaded == data
 
-        file_path = Path(tmpdir) / "seedpass_passwords_db.json.enc"
+        file_path = Path(tmpdir) / "seedpass_entries_db.json.enc"
         raw = file_path.read_bytes()
         assert raw != json.dumps(data, indent=4).encode("utf-8")
 

src/tests/test_entry_add.py

@@ -1,6 +1,7 @@
 import sys
 from pathlib import Path
 from tempfile import TemporaryDirectory
+import pytest
 from helpers import create_vault, TEST_SEED, TEST_PASSWORD
 
 sys.path.append(str(Path(__file__).resolve().parents[1]))
@@ -30,3 +31,30 @@ def test_add_and_retrieve_entry():
         data = enc_mgr.load_json_data(entry_mgr.index_file)
         assert str(index) in data.get("entries", {})
         assert data["entries"][str(index)] == entry
+
+
+@pytest.mark.parametrize(
+    "method, expected_type",
+    [
+        ("add_entry", "password"),
+        ("add_totp", "totp"),
+        ("add_ssh_key", "ssh"),
+        ("add_seed", "seed"),
+    ],
+)
+def test_round_trip_entry_types(method, expected_type):
+    with TemporaryDirectory() as tmpdir:
+        vault, enc_mgr = create_vault(Path(tmpdir), TEST_SEED, TEST_PASSWORD)
+        entry_mgr = EntryManager(vault, Path(tmpdir))
+
+        if method == "add_entry":
+            index = entry_mgr.add_entry("example.com", 8)
+        else:
+            with pytest.raises(NotImplementedError):
+                getattr(entry_mgr, method)()
+            index = 0
+
+        entry = entry_mgr.retrieve_entry(index)
+        assert entry["type"] == expected_type
+        data = enc_mgr.load_json_data(entry_mgr.index_file)
+        assert data["entries"][str(index)]["type"] == expected_type

src/tests/test_entry_management_checksum_path.py

@@ -19,7 +19,7 @@ def test_update_checksum_writes_to_expected_path():
         vault.save_index({"entries": {}})
         entry_mgr.update_checksum()
 
-        expected = tmp_path / "seedpass_passwords_db_checksum.txt"
+        expected = tmp_path / "seedpass_entries_db_checksum.txt"
         assert expected.exists()
 
 
@@ -32,5 +32,5 @@ def test_backup_index_file_creates_backup_in_directory():
         vault.save_index({"entries": {}})
         entry_mgr.backup_index_file()
 
-        backups = list(tmp_path.glob("passwords_db_backup_*.json.enc"))
+        backups = list(tmp_path.glob("entries_db_backup_*.json.enc"))
         assert len(backups) == 1

src/tests/test_manager_workflow.py

@@ -64,9 +64,9 @@ def test_manager_workflow(monkeypatch):
 
         pm.handle_add_password()
         assert pm.is_dirty is False
-        backups = list(tmp_path.glob("passwords_db_backup_*.json.enc"))
+        backups = list(tmp_path.glob("entries_db_backup_*.json.enc"))
         assert len(backups) == 1
-        checksum_file = tmp_path / "seedpass_passwords_db_checksum.txt"
+        checksum_file = tmp_path / "seedpass_entries_db_checksum.txt"
         assert checksum_file.exists()
         checksum_after_add = checksum_file.read_text()
         first_post = pm.nostr_client.published[-1]
@@ -79,7 +79,7 @@ def test_manager_workflow(monkeypatch):
         assert pm.is_dirty is False
         pm.backup_manager.create_backup()
         backup_dir = tmp_path / "backups"
-        backups_mod = list(backup_dir.glob("passwords_db_backup_*.json.enc"))
+        backups_mod = list(backup_dir.glob("entries_db_backup_*.json.enc"))
         assert backups_mod
         checksum_after_modify = checksum_file.read_text()
         assert checksum_after_modify != checksum_after_add

src/tests/test_migrations.py

@@ -23,6 +23,21 @@ def test_migrate_v0_to_v2(tmp_path: Path):
     assert data["entries"]["0"] == expected_entry
 
 
+def test_migrate_v1_to_v2(tmp_path: Path):
+    enc_mgr, vault = setup(tmp_path)
+    legacy = {"schema_version": 1, "passwords": {"0": {"website": "b", "length": 10}}}
+    enc_mgr.save_json_data(legacy)
+    data = vault.load_index()
+    assert data["schema_version"] == LATEST_VERSION
+    expected_entry = {
+        "website": "b",
+        "length": 10,
+        "type": "password",
+        "notes": "",
+    }
+    assert data["entries"]["0"] == expected_entry
+
+
 def test_error_on_future_version(tmp_path: Path):
     enc_mgr, vault = setup(tmp_path)
     future = {"schema_version": LATEST_VERSION + 1, "entries": {}}

src/tests/test_password_properties.py

@@ -6,6 +6,7 @@ from hypothesis import given, strategies as st, settings
 sys.path.append(str(Path(__file__).resolve().parents[1]))
 
 from password_manager.password_generation import PasswordGenerator
+from password_manager.entry_types import EntryType
 
 
 class DummyEnc:
@@ -32,8 +33,10 @@ def make_generator():
 @settings(deadline=None)
 def test_password_properties(length, index):
     pg = make_generator()
+    entry_type = EntryType.PASSWORD.value
     pw1 = pg.generate_password(length=length, index=index)
     pw2 = pg.generate_password(length=length, index=index)
+    assert entry_type == "password"
 
     assert pw1 == pw2
     assert len(pw1) == length