Files
solidcraft/crates/ui-egui/tests/point_constraint_preselection.rs
T
jyvikoandClaude Opus 5.5 dc8b5489fc Wave 257/509: Main's new callers of the placing calls that now return their error (and 1 more)
2 commits, squashed; the originals stay reachable from tag archive/merge-main-develop.

- d63aa814f jyviko: threads: main's tapped-hole sizes and shaft turn-down on the reworked thread
- cfc393d68 jyviko: Main's new callers of the placing calls that now return their error

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ
2026-10-26 13:18:38 -04:00

190 lines
8.5 KiB
Rust

use serde_json::json;
use solidcraft_engine::{Sel, geom::Vec2, sketch::ConstraintKind};
use solidcraft_ui_egui::scenario::Harness;
fn setup() -> Harness {
let mut h = Harness::new();
h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
h.app.run("sketch.line", json!({"points":[[10,10],[30,10]],"infer":false,"connect":false})).unwrap();
h.app.run("sketch.point", json!({"point":[20,20],"id":"a"})).unwrap();
h.app.run("sketch.point", json!({"point":[25,30],"id":"b"})).unwrap();
h.call("ui.view", json!({"view":"top"}));
h
}
#[test]
fn clicked_point_constraint_preselection_applies_and_undoes_once() {
// Pick the edge away from its selectable MID; the point/edge constraint is unchanged.
for (command, picks) in [
("coincident", vec![[20, 20], [25, 30]]),
("coincident", vec![[20, 20], [15, 10]]),
("coincident", vec![[15, 10], [20, 20]]),
("midpoint", vec![[20, 20], [15, 10]]),
("midpoint", vec![[15, 10], [20, 20]]),
("symmetry", vec![[15, 10], [20, 20], [25, 30]]),
("symmetry", vec![[20, 20], [15, 10], [25, 30]]),
] {
let mut h = setup();
for (index, pick) in picks.iter().enumerate() {
h.step(&json!({"click":{"sketch":pick},"shift":index>0})).unwrap();
}
assert_eq!(h.app.session.selection.len(), picks.len(), "{command}");
let before = h.app.session.doc.to_json();
let undo = h.app.session.undo.len();
h.step(&json!({"start":format!("sketch.constraint.{command}")})).unwrap();
assert!(!h.app.status.as_ref().is_some_and(|(_, _, error)| *error), "{command}: {:?}", h.app.status);
assert!(h.app.tool.is_none());
assert!(h.app.session.selection.is_empty());
assert_eq!(h.app.session.undo.len(), undo + 1);
let state = h.app.session.world_state().unwrap();
let sk = &state.sketch(h.app.session.active_sketch.unwrap()).unwrap().sketch;
assert!(sk.constraints.iter().any(|c| match command {
"coincident" => matches!(c.kind, ConstraintKind::Coincident { .. } | ConstraintKind::PointOnCurve { .. }),
"midpoint" => matches!(c.kind, ConstraintKind::Midpoint { .. }),
_ => matches!(c.kind, ConstraintKind::Symmetric { .. }),
}));
let point = |id| sk.point(sk.resolve_point(id).unwrap()).unwrap();
let a = point("a");
let b = point("b");
let start = point("l1.start");
let end = point("l1.end");
let axis = (end - start).normalized().unwrap();
match command {
"midpoint" => assert!(a.dist((start + end) * 0.5) < 1e-6),
"symmetry" => {
assert!(((a + b) * 0.5 - start).cross(axis).abs() < 1e-6);
assert!((b - a).dot(axis).abs() < 1e-6);
}
_ if picks.contains(&[15, 10]) => assert!((a - start).cross(axis).abs() < 1e-6),
_ => assert!(a.dist(b) < 1e-6),
}
let after = h.app.session.doc.to_json();
h.app.run("edit.undo", json!({})).unwrap();
assert_eq!(h.app.session.doc.to_json(), before);
h.app.run("edit.redo", json!({})).unwrap();
assert_eq!(h.app.session.doc.to_json(), after);
}
}
#[test]
fn rejected_and_ambiguous_preselection_preserve_document_and_selection() {
let mut h = setup();
h.app.run("sketch.constraint.fix", json!({"entities":["a","b"]})).unwrap();
h.app.session.selection = vec![Sel::SketchPoint { id: "a".into() }, Sel::SketchPoint { id: "b".into() }];
let selection = h.app.session.selection.clone();
let before = h.app.session.doc.to_json();
let undo = h.app.session.undo.len();
h.step(&json!({"start":"sketch.constraint.coincident"})).unwrap();
assert!(h.app.status.as_ref().is_some_and(|(_, _, error)| *error));
assert_eq!(h.app.session.selection, selection);
assert_eq!(h.app.session.doc.to_json(), before);
assert_eq!(h.app.session.undo.len(), undo);
for command in ["coincident", "midpoint", "symmetry"] {
h.app.session.selection = vec![Sel::SketchPoint { id: "a".into() }];
h.step(&json!({"start":format!("sketch.constraint.{command}")})).unwrap();
assert!(h.app.tool.as_ref().unwrap().picks.is_empty());
assert_eq!(h.app.session.selection.len(), 1);
assert_eq!(h.app.session.doc.to_json(), before);
}
}
// MidPoint centres one line on another when the tool picks two lines.
fn two_lines() -> Harness {
let mut h = Harness::new();
h.app.run("sketch.create", json!({"plane":"XY"})).unwrap();
h.app.run("sketch.line", json!({"points":[[0,0],[60,0]],"infer":false,"connect":false})).unwrap();
h.app.run("sketch.line", json!({"points":[[5,-10],[25,-10]],"infer":false,"connect":false})).unwrap();
h.call("ui.view", json!({"view":"top"}));
h
}
fn line_ends(h: &Harness, id: &str) -> (Vec2, Vec2) {
let state = h.app.session.world_state().unwrap();
let sk = &state.sketch(h.app.session.active_sketch.unwrap()).unwrap().sketch;
let p = |end: &str| sk.point(sk.resolve_point(&format!("{id}.{end}")).unwrap()).unwrap();
(p("start"), p("end"))
}
fn assert_centred(h: &Harness, undo: usize) {
assert!(!h.app.status.as_ref().is_some_and(|(_, _, error)| *error), "{:?}", h.app.status);
assert_eq!(h.app.session.undo.len(), undo + 1);
let (a, b) = line_ends(h, "l1");
assert_eq!((a, b), (Vec2::new(0.0, 0.0), Vec2::new(60.0, 0.0)), "the first line stays");
let (c, d) = line_ends(h, "l2");
assert!(((a + b) * 0.5).dist((c + d) * 0.5) < 1e-6);
assert!((c.dist(d) - 20.0).abs() < 1e-6);
}
#[test]
fn midpoint_tool_clicking_two_lines_centres_them() {
let mut h = two_lines();
let undo = h.app.session.undo.len();
h.step(&json!({"start":"sketch.constraint.midpoint"})).unwrap();
h.step(&json!({"click":{"sketch":[45,0]}})).unwrap();
h.step(&json!({"click":{"sketch":[10,-10]}})).unwrap();
assert_centred(&h, undo);
}
#[test]
fn midpoint_tool_takes_two_preselected_lines() {
let mut h = two_lines();
h.step(&json!({"click":{"sketch":[45,0]}})).unwrap();
h.step(&json!({"click":{"sketch":[10,-10]},"shift":true})).unwrap();
assert_eq!(h.app.session.selection.len(), 2);
let undo = h.app.session.undo.len();
h.step(&json!({"start":"sketch.constraint.midpoint"})).unwrap();
assert!(h.app.tool.is_none());
assert_centred(&h, undo);
}
fn midpoint_ids(h: &Harness) -> Vec<String> {
let state = h.app.session.world_state().unwrap();
let sk = &state.sketch(h.app.session.active_sketch.unwrap()).unwrap().sketch;
sk.constraints.iter().filter(|c| matches!(c.kind, ConstraintKind::Midpoint { .. })).map(|c| c.id.clone()).collect()
}
fn point_count(h: &Harness) -> usize {
let state = h.app.session.world_state().unwrap();
state.sketch(h.app.session.active_sketch.unwrap()).unwrap().sketch.points.len()
}
/// Centre l2 on l1 with the MidPoint tool, then click its glyph and press Delete.
fn centre_then_delete_glyph(h: &mut Harness) {
h.step(&json!({"start":"sketch.constraint.midpoint"})).unwrap();
h.step(&json!({"click":{"sketch":[45,0]}})).unwrap();
h.step(&json!({"click":{"sketch":[10,-10]}})).unwrap();
h.step(&json!({"key":"Escape"})).unwrap();
let ids = midpoint_ids(h);
assert!(ids.len() >= 2, "one point at the middle of both lines");
let glyphs: Vec<_> = solidcraft_ui_egui::sketch_tools::glyph_positions().into_iter().filter(|(id, _)| ids.contains(id)).collect();
assert_eq!(glyphs.len(), 1, "one MidPoint glyph for both lines: {glyphs:?}");
let at = glyphs[0].1;
h.step(&json!({"click":[at.x, at.y]})).unwrap();
h.step(&json!({"key":"Delete"})).unwrap();
for _ in 0..20 {
if midpoint_ids(h).is_empty() {
break;
}
h.frames(1);
}
assert!(midpoint_ids(h).is_empty(), "deleting the glyph removes both constraints: {:?}", midpoint_ids(h));
}
#[test]
fn centred_lines_show_one_midpoint_glyph_that_deletes_both_constraints_and_their_point() {
let mut h = two_lines();
let points = point_count(&h);
centre_then_delete_glyph(&mut h);
assert_eq!(point_count(&h), points, "the point that only tied the midpoints goes too");
}
#[test]
fn deleting_the_shared_midpoint_glyph_keeps_a_point_another_line_uses() {
let mut h = two_lines();
// l3 starts at the midpoint of l2: centring reuses that point, and deleting keeps it.
h.app.run("sketch.line", json!({"points":["mid:l2",[15,-30]],"infer":false,"connect":false})).unwrap();
let points = point_count(&h);
centre_then_delete_glyph(&mut h);
assert_eq!(point_count(&h), points);
}