Skip to content

SolidCraft: an open-source parametric 3D CAD application built in pure Rust. Desktop, web, and automation through MCP.

UI tests: clear each frame's texture changes so they pass with debug assertions (#12779)

PaddleStroke72d2beff717f
diff --git a/crates/ui-egui/src/dialogs_hole.rs b/crates/ui-egui/src/dialogs_hole.rs
index fbefe95b1e..1c7181182a 100644
--- a/crates/ui-egui/src/dialogs_hole.rs
+++ b/crates/ui-egui/src/dialogs_hole.rs
@@ -534,11 +534,12 @@ mod tests {
let ctx = crate::fonts::test_context();
let drawn = |choice: Choice| {
let mut size = egui::Vec2::ZERO;
- let output = ctx.run_ui(Default::default(), |ui| {
+ let mut output = ctx.run_ui(Default::default(), |ui| {
let before = ui.min_rect();
preview(ui, &form, false, choice, &|_, _| Some(10.0));
size = ui.min_rect().size() - before.size();
});
+ output.textures_delta.clear();
assert!(size.x > 0.0 && size.y > 0.0, "{choice:?} drew nothing");
output.shapes.into_iter().map(|c| c.shape).collect::<Vec<_>>()
};
diff --git a/crates/ui-egui/src/render_workspace_tests.rs b/crates/ui-egui/src/render_workspace_tests.rs
index ff7cee6e89..39f047a946 100644
--- a/crates/ui-egui/src/render_workspace_tests.rs
+++ b/crates/ui-egui/src/render_workspace_tests.rs
@@ -7019,13 +7019,16 @@ fn gpu_preparation_shows_shader_warning_then_reports_job_failure() {
.into_iter()
.map(|key| egui::Event::Key { key, physical_key: None, pressed: true, repeat: false, modifiers: egui::Modifiers::NONE })
.collect();
- let _ = h.ctx.run_ui(egui::RawInput { events, ..Default::default() }, |ui| {
- assert!(show_shader_preparation(&mut h.app, ui.ctx()));
- for key in keys {
- assert!(ui.ctx().input_mut(|input| input.consume_key(egui::Modifiers::NONE, key)), "{key:?} must be available to other windows");
- }
- assert!(progress_pill(&mut h.app, ui, "render:progress"));
- });
+ h.ctx
+ .run_ui(egui::RawInput { events, ..Default::default() }, |ui| {
+ assert!(show_shader_preparation(&mut h.app, ui.ctx()));
+ for key in keys {
+ assert!(ui.ctx().input_mut(|input| input.consume_key(egui::Modifiers::NONE, key)), "{key:?} must be available to other windows");
+ }
+ assert!(progress_pill(&mut h.app, ui, "render:progress"));
+ })
+ .textures_delta
+ .clear();
assert!(crate::scenario::rect_of("render:progress:name").is_some());
assert!(crate::scenario::rect_of("dialog:progress:render:progress").is_some());
for control in ["warning", "spinner", "cancel"] {
diff --git a/crates/ui-egui/src/toolbar.rs b/crates/ui-egui/src/toolbar.rs
index e3f3f52569..ad73135205 100644
--- a/crates/ui-egui/src/toolbar.rs
+++ b/crates/ui-egui/src/toolbar.rs
@@ -6405,7 +6405,7 @@ mod persistent_ribbon_tests {
let effects = h.app.session.status_items();
let ctx = h.ctx.clone();
let mut expected = Vec::new();
- let output = ctx.run_ui(
+ let mut output = ctx.run_ui(
egui::RawInput { screen_rect: Some(Rect::from_min_size(egui::Pos2::ZERO, vec2(400.0, 240.0))), focused: true, ..Default::default() },
|ui| {
expected.clear(); // Context layout passes never accumulate stale paint expectations.
@@ -6434,6 +6434,7 @@ mod persistent_ribbon_tests {
paint_persistent_ribbon(&h.app, ui, paints, "INSPECT", "ribbon_grid");
},
);
+ output.textures_delta.clear();
assert_eq!(h.app.session.status_items(), effects, "rendering real active cells never changes their effects");
for (id, cell, original_clip) in expected {
let mut backgrounds = Vec::new();
diff --git a/crates/ui-egui/src/ui_kit/preferences_figure_ops.rs b/crates/ui-egui/src/ui_kit/preferences_figure_ops.rs
index aa809b6229..aabd66f81a 100644
--- a/crates/ui-egui/src/ui_kit/preferences_figure_ops.rs
+++ b/crates/ui-egui/src/ui_kit/preferences_figure_ops.rs
@@ -807,7 +807,7 @@ mod tests {
#[test]
fn rounded_rectangle_preserves_its_authored_dashes() {
let ctx = crate::fonts::test_context();
- let output = ctx.run_ui(egui::RawInput::default(), |ui| {
+ let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
let t = Tokens::light();
let drawing = Ctx { t: &t, sample: None, palette: Palette::Figure, origin: pos2(10.0, 10.0), scale: 1.0 };
draw(
@@ -822,6 +822,7 @@ mod tests {
None,
);
});
+ output.textures_delta.clear();
// A dashed outline is separate path segments, never a solid rectangle stroke.
assert!(output.shapes.len() > 4);
assert!(output.shapes.iter().all(|shape| !matches!(shape.shape, Shape::Rect(_))));
diff --git a/crates/ui-egui/src/ui_kit/preferences_figures.rs b/crates/ui-egui/src/ui_kit/preferences_figures.rs
index c63ce27be4..585dda2487 100644
--- a/crates/ui-egui/src/ui_kit/preferences_figures.rs
+++ b/crates/ui-egui/src/ui_kit/preferences_figures.rs
@@ -314,10 +314,11 @@ mod tests {
crate::theme::set_dark(dark);
let draw = |state| {
let ctx = crate::fonts::test_context();
- let output = ctx.run_ui(egui::RawInput::default(), |ui| {
+ let mut output = ctx.run_ui(egui::RawInput::default(), |ui| {
ui.set_width(262.0);
super::paint_layout(ui, state);
});
+ output.textures_delta.clear();
format!("{:?}", output.shapes)
};
let original = draw(baseline);
diff --git a/crates/ui-egui/src/ui_kit/slider_tests.rs b/crates/ui-egui/src/ui_kit/slider_tests.rs
index 71b31b961e..54ba232733 100644
--- a/crates/ui-egui/src/ui_kit/slider_tests.rs
+++ b/crates/ui-egui/src/ui_kit/slider_tests.rs
@@ -116,11 +116,12 @@ fn blur_meter_boundaries_and_off_thumb() {
let ctx = crate::fonts::test_context();
let t = Tokens::get();
let mut value = radius;
- let out = ctx.run_ui(egui::RawInput::default(), |ui| {
+ let mut out = ctx.run_ui(egui::RawInput::default(), |ui| {
scope(ui, |ui| {
slider(ui, &mut value, 0.0..=40.0, Slider { step: Some(1.0), show_value: false, off_endpoint: true, ..Default::default() });
});
});
+ out.textures_delta.clear();
assert_eq!(value, radius, "drawing cannot round persisted fractional values");
assert_eq!(out.shapes.iter().filter(|s| matches!(s.shape, egui::Shape::Circle(_))).count(), 1, "off/solid thumb has no native duplicate");
let hit = scenario::rect_of("dialog:slider_track:").expect("blur slider track");