From 0b900c7b79aeb9429bf5175c439ad05c6a0ac2cb Mon Sep 17 00:00:00 2001 From: Orual Date: Mon, 3 Aug 2026 01:45:33 -0400 Subject: [PATCH] PM-78: align graph gate with LDParse child semantics Epic: PM-86 Task: PM-78 --- crates/polymodel-ldraw-testkit/src/gates.rs | 88 +++++++++++++-------- 1 file changed, 55 insertions(+), 33 deletions(-) diff --git a/crates/polymodel-ldraw-testkit/src/gates.rs b/crates/polymodel-ldraw-testkit/src/gates.rs index f15fbfe..eeaaee7 100644 --- a/crates/polymodel-ldraw-testkit/src/gates.rs +++ b/crates/polymodel-ldraw-testkit/src/gates.rs @@ -79,7 +79,7 @@ pub const GATE_DEFINITIONS: &[GateDefinition] = &[ id: "graph_identity_and_instances", profiles: &[Profile::Strict, Profile::Compatibility], tags: &["graph_identity_and_instances"], - required_fields: &["canonical.scene.model_id", "canonical.scene.instance_ids"], + required_fields: &["canonical.scene.instances"], scope: GateScope::Authored, }, GateDefinition { @@ -164,6 +164,12 @@ pub enum GateFailure { }, #[error("gate {gate} found an invalid oracle certification for {fixture}")] InvalidCertification { gate: String, fixture: String }, + #[error("gate {gate} cannot validate {fixture}: {field}")] + MissingAuthority { + gate: String, + fixture: String, + field: String, + }, } pub trait CorpusGate { @@ -285,47 +291,39 @@ impl CorpusGate for NamedGate { } } "graph_identity_and_instances" => { - let legacy_sequential_ids = expected_canonical.scene.model_id.starts_with("model-") - && expected_canonical + if expected_canonical.scene.instances.is_empty() { + return Err(GateFailure::MissingAuthority { + gate: definition.id.into(), + fixture: fixture.id.into(), + field: "canonical.scene.instances: authored ordered child tuples (source_model, target_model, transform, inversion) are required; synthetic model-/instance-* IDs are not graph authority".into(), + }); + } + + let edges_match = actual.scene.instances.len() + == expected_canonical.scene.instances.len() + && actual .scene - .instance_ids + .instances .iter() - .all(|id| id.starts_with("instance-")); - let matches = if legacy_sequential_ids { - actual.scene.model_id - == actual - .semantic - .canonical_path - .as_deref() - .unwrap_or_default() - && actual.scene.instance_ids.len() - == expected_canonical.scene.instance_ids.len() - && { - let mut ids = BTreeSet::new(); - actual - .scene - .instance_ids - .iter() - .all(|instance_id| ids.insert(instance_id)) - } - } else { - actual.scene.model_id == expected_canonical.scene.model_id - && actual.scene.instance_ids == expected_canonical.scene.instance_ids - }; - if matches { + .zip(&expected_canonical.scene.instances) + .all(|(actual_edge, expected_edge)| { + actual_edge.source_model == expected_edge.source_model + && actual_edge.target_model == expected_edge.target_model + && actual_edge.transform == expected_edge.transform + && actual_edge.inverted == expected_edge.inverted + }); + if edges_match { Ok(()) } else { Err(GateFailure::FieldMismatch { gate: definition.id.into(), fixture: format!( - "{} actual_model={} actual_instances={} expected_model={} expected_instances={}", + "{} actual_edges={} expected_edges={}", fixture.id, - actual.scene.model_id, - actual.scene.instance_ids.len(), - expected_canonical.scene.model_id, - expected_canonical.scene.instance_ids.len(), + actual.scene.instances.len(), + expected_canonical.scene.instances.len(), ), - field: "canonical.scene graph identity".into(), + field: "canonical.scene.instances ordered child tuples".into(), }) } } @@ -567,6 +565,30 @@ mod tests { assert!(gate.evaluate(&fixture, &fixture.expected, &actual).is_err()); } + #[test] + fn synthetic_sequential_ids_cannot_satisfy_graph_gate() { + let fixture = inventory() + .into_iter() + .find(|fixture| fixture.id == "graph-instances") + .unwrap(); + let gate = NamedGate { + definition: GATE_DEFINITIONS + .iter() + .find(|definition| definition.id == "graph_identity_and_instances") + .unwrap(), + }; + + let error = gate + .evaluate(&fixture, &fixture.expected, &fixture.expected.canonical) + .expect_err("synthetic IDs must not satisfy the graph gate"); + assert!(matches!( + error, + GateFailure::MissingAuthority { ref field, .. } + if field.contains("ordered child tuples") + && field.contains("synthetic model-/instance-* IDs") + )); + } + #[test] fn live_testkit_sources_do_not_contain_heuristic_generators() { let source_root = std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("src"); -- knotmirror 0.0.1