From 7ed3163f35ea3a60f809889df6e50cc44ef9170c Mon Sep 17 00:00:00 2001 From: FredApps <153173854+FredApps@users.noreply.github.com> Date: Mon, 16 Nov 2026 13:45:33 +0100 Subject: [PATCH] render-parity: a NaN tolerance fails its check instead of switching it off --- crates/render-parity/src/lib.rs | 14 ++++++++++---- crates/render-parity/src/tests.rs | 11 +++++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/crates/render-parity/src/lib.rs b/crates/render-parity/src/lib.rs index f2e541801..aedac7f0f 100644 --- a/crates/render-parity/src/lib.rs +++ b/crates/render-parity/src/lib.rs @@ -112,7 +112,7 @@ pub struct Report { } impl Report { - /// Whether every measure is within `tolerance`. + /// Whether every measure is within `tolerance`. A NaN limit is never met. pub fn within(&self, tolerance: &Tolerance) -> bool { self.exceeded(tolerance).is_empty() } @@ -120,13 +120,13 @@ impl Report { /// The measures over `tolerance`, each with its value and limit, for a test failure message. pub fn exceeded(&self, tolerance: &Tolerance) -> Vec { let mut over = Vec::new(); - if self.max_delta_e > tolerance.max_delta_e { + if exceeds(self.max_delta_e, tolerance.max_delta_e) { over.push(format!("max ΔE2000 {:.4} > {}", self.max_delta_e, tolerance.max_delta_e)); } - if self.mean_delta_e > tolerance.mean_delta_e { + if exceeds(self.mean_delta_e, tolerance.mean_delta_e) { over.push(format!("mean ΔE2000 {:.4} > {}", self.mean_delta_e, tolerance.mean_delta_e)); } - if self.max_channel > tolerance.max_channel { + if exceeds(f64::from(self.max_channel), f64::from(tolerance.max_channel)) { over.push(format!("max channel difference {:.6} > {}", self.max_channel, tolerance.max_channel)); } over @@ -179,6 +179,12 @@ pub fn compare(expected: &Image<'_>, actual: &Image<'_>) -> Result bool { + !matches!(value.partial_cmp(&limit), Some(std::cmp::Ordering::Less | std::cmp::Ordering::Equal)) +} + fn finite(px: [f32; 3]) -> Option<[f32; 3]> { px.iter().all(|v| v.is_finite()).then_some(px) } diff --git a/crates/render-parity/src/tests.rs b/crates/render-parity/src/tests.rs index 3649c37d3..a5c81f24f 100644 --- a/crates/render-parity/src/tests.rs +++ b/crates/render-parity/src/tests.rs @@ -87,3 +87,14 @@ fn bad_inputs_are_errors_not_panics() { let e: Box = Box::new(e); assert!(e.source().is_none()); } + +#[test] +fn a_nan_tolerance_fails_every_check() { + let rgb = gray_ramp(2, 2); + let image = Image::new(2, 2, &rgb).unwrap(); + let report = compare(&image, &image).unwrap(); + let nan = Tolerance { max_delta_e: f64::NAN, mean_delta_e: f64::NAN, max_channel: f32::NAN }; + assert_eq!(report.exceeded(&nan).len(), 3); + assert!(!report.within(&nan)); + assert!(report.within(&Tolerance { max_delta_e: f64::INFINITY, ..Tolerance::BASELINE })); +}