Refactor assert_rendered_output internals

Previously assert_rendered_output used String building to generate
matching lines. While this works, it makes adding more dynamic pattern
matching impossible. This updates those Strings into a set of
LinePattern matchers, that can match dynamically, based on the type,
instead of String comparisons.

As well, previously, assert_rendered_output matched against the entire
rendered output, including an often repeated header. This also provides
a new mode for the macro, that will only render and match against the
view body. This should allow assertions to be simplified in cases where
the header values are not important.

Author: MitMaro

Cargo.lock

@@ -15,7 +15,7 @@ readme = "README.md"
 name = "view"
 
 [features]
-testutils = ["dep:bitflags"]
+testutils = ["dep:bitflags", "dep:iter_tools"]
 
 [dependencies]
 anyhow = "1.0.72"
@@ -25,6 +25,7 @@ crossbeam-channel = "0.5.8"
 parking_lot = "0.12.1"
 unicode-segmentation = "1.10.1"
 unicode-width = "0.1.10"
+iter_tools = { version = "0.1.4", optional = true }
 xi-unicode = "0.3.0"
 girt-display = {version = "2.3.0", path = "../display"}
 girt-runtime = {version = "2.3.0", path = "../runtime"}

src/view/Cargo.toml

@@ -1,7 +1,13 @@
 use display::DisplayColor;
 
 use super::*;
-use crate::testutil::{_assert_rendered_output, render_view_line, AssertRenderOptions};
+use crate::testutil::{
+	assert_rendered_output::_assert_rendered_output,
+	render_view_line,
+	AssertRenderOptions,
+	ExactPattern,
+	LinePattern,
+};
 
 fn assert_rendered(render_slice: &RenderSlice, expected: &[&str]) {
 	let mut output = vec![];
@@ -48,10 +54,17 @@ fn assert_rendered(render_slice: &RenderSlice, expected: &[&str]) {
 			}
 		}
 	}
+
 	_assert_rendered_output(
 		AssertRenderOptions::default(),
 		&output,
-		&expected.iter().map(|s| String::from(*s)).collect::<Vec<String>>(),
+		&expected
+			.iter()
+			.map(|s| {
+				let pattern: Box<dyn LinePattern> = Box::new(ExactPattern::new(s));
+				pattern
+			})
+			.collect::<Vec<Box<dyn LinePattern>>>(),
 	);
 }