Changeset 6ad031b in flexoentity for tests

Timestamp:

11/18/25 13:34:13 (2 months ago)

Author:

Enrico Schwass <ennoausberlin@…>

Branches:

master

Children:

8840db7

Parents:

4dc09bb

Message:

another round of domain refactoring

Location:

tests

Files:

• conftest.py (modified) (2 diffs)
• test_domain.py (added)
• test_flexoid.py (modified) (3 diffs)
• test_from_strings.py (added)
• test_id_stress.py (modified) (4 diffs)

tests/conftest.py

@@ -46 +46 @@
         if not getattr(self, "flexo_id", None):
             self.flexo_id = FlexOID.safe_generate(
-                domain=self.default_domain_code,
+                domain=self.domain_id,
                 entity_type=SingleChoiceQuestion.ENTITY_TYPE.value,     # 'I'
                 estate=EntityState.DRAFT.value,        # 'D'
@@ -86 +86 @@
 
 @pytest.fixture
-def domain():
-    return Domain.default()
+def sample_domain():
+    domain_id = "PY_ARITHM"
+    flexo_id = FlexOID.safe_generate(domain_id=domain_id,
+                                     entity_type=EntityType.DOMAIN.value,
+                                     state=EntityState.DRAFT.value, text=domain_id)
+    return Domain(flexo_id=flexo_id, fullname="PYTHON_ARITHMETIC",
+                  description="ALL ABOUT ARITHMETIC IN PYTHON")
 
 @pytest.fixture
-def sample_question():
-    q = SingleChoiceQuestion(text="What is 2 + 2?",
+def sample_question(sample_domain):
+    flexo_id = FlexOID.safe_generate(domain_id=sample_domain.domain_id,
+                                     entity_type=EntityType.ITEM.value,
+                                     state=EntityState.DRAFT.value,
+                                     text="What is 2 + 2")
+    q = SingleChoiceQuestion(flexo_id=flexo_id, text="What is 2 + 2?",
                              options=[])
     q._update_fingerprint()

tests/test_flexoid.py

@@ -25 +25 @@
     fid = FlexOID("GEN-I251101-ABCDEF123456@001D")
     assert isinstance(fid, str)
-    assert fid.domain == "GEN"
+    assert fid.domain_id == "GEN"
     assert fid.entity_type == "I"
     assert fid.date_str == "251101"
@@ -58 +58 @@
     assert fid1 == fid2  # deterministic
     assert fid1.hash_part == fid2.hash_part
-    assert fid1.domain == "GEN"
+    assert fid1.domain_id == "GEN"
     assert fid1.entity_type == "I"
 
@@ -135 +135 @@
     fid = FlexOID("GEN-I251101-ABCDEF123456@007S")
     data = fid.parsed()
-    assert data["domain"] == "GEN"
+    assert data["domain_id"] == "GEN"
     assert data["entity_type"] == "I"
     assert data["version"] == 7

tests/test_id_stress.py

@@ -14 +14 @@
 logger = logging.getLogger(__name__)
 
-def test_bulk_generation_uniqueness(domain):
+def test_bulk_generation_uniqueness(sample_domain):
     """
     Generate 100,000 IDs and ensure uniqueness using safe_generate().
@@ -33 +33 @@
     ids = []
     for seed in seeds:
-        oid = FlexOID.safe_generate(domain.domain_code, entity_type.value, estate.value, seed, repo=repo)
+        oid = FlexOID.safe_generate(sample_domain.domain_id, entity_type.value,
+                                    estate.value, seed, repo=repo)
         assert isinstance(oid, FlexOID)
         ids.append(str(oid))
@@ -48 +49 @@
 
     # Sanity check: IDs should look canonical
-    assert all(id_str.startswith("GEN") for id_str in ids)
+    # assert all(id_str.startswith("GENERIC") for id_str in ids)
     assert all("@" in id_str for id_str in ids)
 
-def test_id_generation_is_deterministic(domain):
+def test_id_generation_is_deterministic(sample_domain):
     """
     Generating the same entity twice with same inputs yields identical ID.
@@ -60 +61 @@
     text = "identical question text"
 
-    id1 = FlexOID.generate(domain.domain_code, entity_type.value, estate.value, text)
-    id2 = FlexOID.generate(domain.domain_code, entity_type.value, estate.value, text)
+    id1 = FlexOID.generate(sample_domain.domain_id, entity_type.value, estate.value, text)
+    id2 = FlexOID.generate(sample_domain.domain_id, entity_type.value, estate.value, text)
     # IDs must be identical because generation is deterministic
     assert id1 == id2
-
-
-# def test_id_reproducibility_across_runs(domain):
-#     """
-#     The same seed on a new process (fresh _seen_hashes)
-#     should yield the same base ID (without suffix).
-#     """
-#     entity_type = EntityType.CATALOG
-#     estate = EntityState.DRAFT
-#     seed = "reproducibility test seed"
-
-#     id1 = FlexOID.generate(domain.domain_code, entity_type.value, estate.value, seed)
-#     FlexOID._seen_hashes.clear()
-#     id2 = FlexOID.generate(domain.domain_code, entity_type.value, estate.value, seed)
-
-#     assert id1 == id2