054392abbe
39 commits, squashed; the originals stay reachable from tag archive/merge-main-develop. These commits sit on several merged branches, so the wave holds their combined result. - 1b17dd7f5 brett19: Merge fixes: every crate and test target compiles on the merged tree, but for crates/geom's hlr - 8f2c11da2 brett19: Drawings hidden lines: read develop's B-rep records - c30ca0216 brett19: Hidden-line fixtures: build develop's records from the fixtures' data - 5dd2509ae brett19: Hidden lines: tests of the bounded edges, face charts and placed revolutions - 1642df0ea brett19: drawing-hlr doc: what is drawn and refused on develop's records - ddcb80c8e brett19: hlr tests: a placed revolution is refused when its placement is not rigid - e4977721f brett19: Hidden lines: a traced intersection is drawn only where its spline lies on both surfaces - b3ef6ae52 brett19: Hidden lines: kernel bodies through the production prepare against closed forms - 4cd2ae062 brett19: Tests from main: the world state is a Result here - 51d7ad09e brett19: A blend's pick measures close edges on their curves, not their polylines - 11a89713c brett19: Merge fixes from the first SMLib test pass - 48fcb7aac brett19: Merge fixes from the ui test pass and the gates - abd739855 brett19: A silhouette takes its facing from the surface's normals - 85114c5a2 brett19: Clippy and rustfmt on the merged tree - 55a46569f brett19: Stepwise open checks every feature under the session's mode - 4627402e4 brett19: Clippy without SMLib: the planar-sheet edge reader is built only with it - 5fbece0ac brett19: STEP import: a ball's halves whose seams are off each other's quarter lines each form within one turn - eb78d20b0 brett19: Lid ring sketch test: find the ring under the pick, not by main's kernel's name - 3048d8c49 brett19: Viewport culling test: each box's triangles from its mesh, not 12 - dc88b80e2 brett19: Timeline chip test: a fillet that really reduces - 876203621 brett19: Edge names: a seam names its one face once; the curve-id test reads every edge kernel-neutrally - 900635710 brett19: rustfmt on the merged tree - b7e83cd7c brett19: Known failing on SMLib: two of main's new tests assume truck's box mesh and fillet torus - 63bde053a jyviko: Locales: Vietnamese for the setback-too-short refusal, now that vi is a complete catalog - 967a1caa6 brett19: Kernel rig: exact volumes for 1213's bent-tube round and 4782's bar round, rel 1e-6 - 82c821d2a brett19: After the merge: clippy's auto-deref, and the mesh-decisions list for the merged tree - 5862ee223 brett19: After the merge: main's new tests on the SMLib kernel - be78372b2 brett19: Twisted sweep: circles about a straight path are exact cylinders (solidcore#2184) - 312d14500 jyviko: After the merge: a hole that misses is found by exact boxes; a face is a one-face patch; main's mesh-box helpers gone - 6f7e51acb jyviko: After the merge: split_move's Result reaches its callers; to_local's duplicated move check goes - 8f0c79b20 jyviko: After the merge: main's two new tests take world_state's Result, as the rest of their files do - 5f4d70061 jyviko: After the merge with main: its new code on develop's exact bounds, types and thread fields - 2b2ab6627 jyviko: Cargo.lock: develop's profile, smlib and step crates at main's 0.30.1 - e6a4b0a9a jyviko: Kernel rig: main's six new sketch-only commands are exempt from a kernel case - 5acbd2e71 jyviko: Cuts leave the bodies their tools can't reach, by exact boxes (#10225 on exact geometry) - d2b202307 jyviko: Kernel rig: main's new view, rendering, appearance and settings commands are exempt from a case - 21db090ba jyviko: Kernel rig: construct.plane.axis_point gets construction cases - c1f45cae2 jyviko: Kernel rig: assembly cases for mass properties, align, find limits and moving items between parts - 084695416 jyviko: Kernel rig: export and print face cases in the import area Co-authored-by: jyviko <2501648+jyviko@users.noreply.github.com> Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01DtL5M41G8Nua7HvuFPZkmJ
165 lines
7.6 KiB
Rust
165 lines
7.6 KiB
Rust
//! A design's command script (`timeline.export_script`, #886) replays into the same design:
|
|
//! every corpus design that the script supports comes back with the same timeline, parameters,
|
|
//! settings and bodies.
|
|
|
|
use std::path::{Path, PathBuf};
|
|
|
|
use serde_json::{Value, json};
|
|
use solidcraft_engine::Session;
|
|
|
|
fn corpus() -> Vec<PathBuf> {
|
|
let dir = Path::new(env!("CARGO_MANIFEST_DIR")).join("tests/corpus");
|
|
let mut v: Vec<PathBuf> =
|
|
std::fs::read_dir(&dir).unwrap().flatten().map(|e| e.path()).filter(|p| p.extension().is_some_and(|x| x == "solidcraft")).collect();
|
|
v.sort();
|
|
assert!(v.len() >= 7, "corpus files in {}", dir.display());
|
|
v
|
|
}
|
|
|
|
/// Designs with components or joints, which scripts do not support yet.
|
|
const ASSEMBLIES: [&str; 2] = ["components-arm", "joints-hinge"];
|
|
|
|
fn bodies(s: &mut Session) -> Vec<(String, f64, f64, Value)> {
|
|
let m = s.execute("inspect.measure", &json!({})).unwrap();
|
|
let mut v: Vec<_> = m["bodies"]
|
|
.as_array()
|
|
.into_iter()
|
|
.flatten()
|
|
.map(|b| {
|
|
(
|
|
b["name"].as_str().unwrap_or_default().to_string(),
|
|
b["volume_mm3"].as_f64().unwrap(),
|
|
b["area_mm2"].as_f64().unwrap(),
|
|
b["faces"].clone(),
|
|
)
|
|
})
|
|
.collect();
|
|
v.sort_by(|a, b| a.0.cmp(&b.0));
|
|
v
|
|
}
|
|
|
|
fn errors(s: &Session) -> Vec<(u64, Option<String>)> {
|
|
s.model.results.iter().map(|r| (r.id, r.error.clone())).collect()
|
|
}
|
|
|
|
fn params(s: &Session) -> Vec<solidcraft_engine::doc::Param> {
|
|
let mut v = s.doc.params.clone();
|
|
v.sort_by(|a, b| a.name.cmp(&b.name));
|
|
v
|
|
}
|
|
|
|
#[test]
|
|
fn corpus_designs_replay_from_their_scripts() {
|
|
let mut replayed = 0;
|
|
for p in corpus() {
|
|
let name = p.file_stem().unwrap_or_default().to_string_lossy().to_string();
|
|
let mut s = Session::default();
|
|
s.execute("doc.open", &json!({"path": p.to_string_lossy()})).unwrap();
|
|
let r = match s.execute("timeline.export_script", &json!({})) {
|
|
Ok(r) => r,
|
|
Err(e) => {
|
|
assert!(ASSEMBLIES.contains(&name.as_str()), "{name}: {e}");
|
|
assert!(e.to_string().contains("not supported yet"), "{name}: {e}");
|
|
continue;
|
|
}
|
|
};
|
|
assert!(!ASSEMBLIES.contains(&name.as_str()), "{name} has components: the script should refuse it");
|
|
// Through text, as a script file would carry it.
|
|
let script: Value = serde_json::from_str(&r["script"].to_string()).unwrap();
|
|
let mut t = Session::default();
|
|
t.run_script(&script).unwrap_or_else(|e| panic!("{name}: {e}"));
|
|
assert_eq!(t.doc.features, s.doc.features, "{name}: timeline");
|
|
assert_eq!(params(&t), params(&s), "{name}: parameters");
|
|
assert_eq!(t.doc.marker, s.doc.marker, "{name}: marker");
|
|
assert_eq!(t.doc.units, s.doc.units, "{name}: units");
|
|
assert_eq!(t.doc.sheet, s.doc.sheet, "{name}: sheet metal rules");
|
|
assert_eq!(t.doc.plastic, s.doc.plastic, "{name}: plastic rules");
|
|
assert_eq!(t.doc.materials, s.doc.materials, "{name}: materials");
|
|
assert_eq!(t.doc.user_materials, s.doc.user_materials, "{name}: user materials");
|
|
assert_eq!(t.doc.favorites, s.doc.favorites, "{name}: favourites");
|
|
assert_eq!(t.doc.param_comments, s.doc.param_comments, "{name}: comments");
|
|
assert_eq!(errors(&t), errors(&s), "{name}: feature results");
|
|
assert_eq!(bodies(&mut t), bodies(&mut s), "{name}: bodies");
|
|
replayed += 1;
|
|
}
|
|
assert!(replayed >= 7, "replayed {replayed} corpus designs");
|
|
}
|
|
|
|
/// #1990: a sketch and its extrude may share a name, and the design's script still replays,
|
|
/// keeping the names: the replayed design's own script has the same steps.
|
|
#[test]
|
|
fn a_design_naming_a_sketch_and_its_extrude_alike_replays_from_its_script() {
|
|
let dir = std::env::temp_dir().join(format!("solidcraft-shared-names-{}", std::process::id()));
|
|
std::fs::create_dir_all(&dir).unwrap();
|
|
let cli = |args: &[&std::ffi::OsStr]| {
|
|
let out = std::process::Command::new(env!("CARGO_BIN_EXE_solidcraft-cli")).args(args).output().unwrap();
|
|
assert!(
|
|
out.status.success(),
|
|
"{}: {}",
|
|
args.iter().map(|a| a.to_string_lossy()).collect::<Vec<_>>().join(" "),
|
|
String::from_utf8_lossy(&out.stderr)
|
|
);
|
|
};
|
|
let script = dir.join("mini.json");
|
|
let saved = dir.join("mini.solidcraft");
|
|
let exported = dir.join("rt.json");
|
|
let replayed = dir.join("rt.solidcraft");
|
|
let again = dir.join("rt2.json");
|
|
let commands = json!({"commands": [
|
|
{"command": "sketch.create", "params": {"plane": "XY", "name": "Block"}},
|
|
{"command": "sketch.rectangle.two_point", "params": {"p0": [0, 0], "p1": [20, 10]}},
|
|
{"command": "sketch.finish", "params": {}},
|
|
{"command": "solid.extrude", "params": {"distance": "5", "name": "Block"}},
|
|
]});
|
|
std::fs::write(&script, commands.to_string()).unwrap();
|
|
cli(&["run".as_ref(), script.as_ref(), "--save".as_ref(), saved.as_ref()]);
|
|
cli(&["script".as_ref(), saved.as_ref(), "--out".as_ref(), exported.as_ref()]);
|
|
cli(&["run".as_ref(), exported.as_ref(), "--save".as_ref(), replayed.as_ref()]);
|
|
cli(&["script".as_ref(), replayed.as_ref(), "--out".as_ref(), again.as_ref()]);
|
|
let first: Value = serde_json::from_str(&std::fs::read_to_string(&exported).unwrap()).unwrap();
|
|
let second: Value = serde_json::from_str(&std::fs::read_to_string(&again).unwrap()).unwrap();
|
|
let _ = std::fs::remove_dir_all(&dir);
|
|
let names: Vec<&str> = first["commands"].as_array().unwrap().iter().filter_map(|c| c["params"]["feature"]["name"].as_str()).collect();
|
|
assert_eq!(names, ["Block", "Block"], "{first:#}");
|
|
assert_eq!(second["commands"], first["commands"], "the replayed design's script has the same steps");
|
|
}
|
|
|
|
/// #10230: script export must disclose the print-face state that replay leaves out.
|
|
#[test]
|
|
fn script_export_warns_about_omitted_print_faces_on_stderr() {
|
|
let dir = std::env::temp_dir().join(format!("solidcraft-print-face-script-{}", std::process::id()));
|
|
std::fs::create_dir_all(&dir).unwrap();
|
|
let saved = dir.join("block.sc");
|
|
let exported = dir.join("block.json");
|
|
let mut s = Session::default();
|
|
s.execute("solid.box", &json!({"length": 20, "width": 10, "height": 5, "body_name": "Block"})).unwrap();
|
|
s.execute("body.print_face", &json!({"body": "Block", "point": [10, 5, 0]})).unwrap();
|
|
s.execute("file.save", &json!({"path": saved})).unwrap();
|
|
let native = std::fs::read(&saved).unwrap();
|
|
|
|
for to_file in [false, true] {
|
|
let mut cmd = std::process::Command::new(env!("CARGO_BIN_EXE_solidcraft-cli"));
|
|
cmd.arg("script").arg(&saved);
|
|
if to_file {
|
|
cmd.arg("--out").arg(&exported);
|
|
}
|
|
let out = cmd.output().unwrap();
|
|
let stderr = String::from_utf8_lossy(&out.stderr);
|
|
assert!(out.status.success(), "{stderr}");
|
|
assert!(stderr.contains("note: the script leaves out print-face assignments (body.print_face)"), "{stderr}");
|
|
let script = if to_file {
|
|
assert!(out.stdout.is_empty(), "--out must keep stdout empty");
|
|
std::fs::read(&exported).unwrap()
|
|
} else {
|
|
out.stdout
|
|
};
|
|
let script: Value = serde_json::from_slice(&script).unwrap();
|
|
let mut replayed = Session::default();
|
|
replayed.run_script(&script).unwrap();
|
|
assert!(replayed.doc.print_faces.is_empty());
|
|
assert_eq!(replayed.doc.features, s.doc.features);
|
|
assert_eq!(std::fs::read(&saved).unwrap(), native, "export must not change the source design");
|
|
}
|
|
std::fs::remove_dir_all(dir).unwrap();
|
|
}
|