From c66256124a2d6b77922b1b2d506f9c8f7606a830 Mon Sep 17 00:00:00 2001 From: unspeaker Date: Sat, 15 Feb 2025 19:58:08 +0000 Subject: [PATCH] 35.88% coverage --- Justfile | 2 +- edn/src/iter.rs | 28 ++++++++++++++++------------ tek/src/view_arranger.rs | 30 ++++++++++++++++++++++++++---- 3 files changed, 43 insertions(+), 17 deletions(-) diff --git a/Justfile b/Justfile index 7cea9f46..ea8a1431 100644 --- a/Justfile +++ b/Justfile @@ -30,7 +30,7 @@ cov: {{covfig}} time grcov . -s . {{grcov-binary}} {{grcov-ignore}} -t html -o target/coverage/html cov-md: {{covfig}} time cargo test -j4 --workspace --exclude jack --profile coverage - {{covfig}} time grcov . -s . {{grcov-binary}} {{grcov-ignore}} -t markdown + {{covfig}} time grcov . -s . {{grcov-binary}} {{grcov-ignore}} -t markdown | sort llcov: time cargo llvm-cov --workspace --exclude jack --profile coverage --no-report time cargo llvm-cov --workspace --exclude jack --profile coverage --no-report --doc diff --git a/edn/src/iter.rs b/edn/src/iter.rs index bf6d6096..4ee1dc90 100644 --- a/edn/src/iter.rs +++ b/edn/src/iter.rs @@ -111,6 +111,22 @@ pub const fn to_digit (c: char) -> Result { #[cfg(test)] mod test_token_iter { use super::*; //use proptest::prelude::*; + #[test] fn test_iters () { + let mut iter = crate::SourceIter::new(&":foo :bar"); + let _ = iter.next(); + let mut iter = crate::TokenIter::new(&":foo :bar"); + let _ = iter.next(); + } + #[test] const fn test_const_iters () { + let mut iter = crate::SourceIter::new(&":foo :bar"); + let _ = iter.next(); + } + #[test] fn test_num () { + let digit = to_digit('0'); + let digit = to_digit('x'); + let number = to_number(&"123"); + let number = to_number(&"12asdf3"); + } //proptest! { //#[test] fn proptest_source_iter ( //source in "\\PC*" @@ -125,16 +141,4 @@ pub const fn to_digit (c: char) -> Result { ////let _ = iter.next(); //} //} - #[test] fn test_iters () { - let mut iter = crate::SourceIter::new(&":foo :bar"); - let _ = iter.next(); - let mut iter = crate::TokenIter::new(&":foo :bar"); - let _ = iter.next(); - } - #[test] fn test_num () { - let digit = to_digit('0'); - let digit = to_digit('x'); - let number = to_number(&"123"); - let number = to_number(&"12asdf3"); - } } diff --git a/tek/src/view_arranger.rs b/tek/src/view_arranger.rs index 6b43e5f8..8bdcfab3 100644 --- a/tek/src/view_arranger.rs +++ b/tek/src/view_arranger.rs @@ -82,7 +82,7 @@ impl Tek { }; let tracks = move||self.tracks_sizes().map_while(filter); Align::x(Tui::bg(Reset, Map::new(tracks, move|(index, track, x1, x2), _|{ - let width = (x2 - x1) as u16; + let width = (x2 - x1) as u16; map_east(x1 as u16, width, Fixed::x(width, Tui::fg_bg( track.color.lightest.rgb, track.color.base.rgb, @@ -332,20 +332,42 @@ fn io_conns <'a, T: PortsSizes<'a>> ( #[cfg(test)] mod test { use super::*; #[test] fn test_view_arranger () { - let mut app = Tek::default(); let mut output = TuiOut::default(); + output.area[2] = 9; + output.area[3] = 9; + + let mut app = Tek::default(); app.editor = Some(Default::default()); app.scenes_add(5); app.tracks_add(5, Some(5), &[], &[]); + Content::render(&io_ports(Reset, Reset, ||app.inputs_sizes()), &mut output); Content::render(&io_conns(Reset, Reset, ||app.outputs_sizes()), &mut output); - Content::render(&app.per_track(|_, _|()), &mut output); + Content::render(&app.per_track(|_, _|()), &mut output); Content::render(&app.per_track_top(|_, _|()), &mut output); + app.redraw_arranger(); Content::render(&app.view_arranger(), &mut output); Content::render(&app.view_inputs(), &mut output); Content::render(&app.view_outputs(), &mut output); - Content::render(&track_header(0, &Default::default(), true), &mut output); + Content::render(&app.view_scenes(), &mut output); + + Content::render( + &app.view_scene_name(0, 0, 0, 0, &Default::default(), None), + &mut output); + + Content::render( + &app.view_scene_clip(0, 0, 0, &{ + let mut scene: Scene = Default::default(); + scene.clips.push(Some(Default::default())); + scene + }, None, 0, 0, false, false, None), + &mut output); + + Content::render( + &track_header(0, &Default::default(), true), + &mut output); + Content::render(&scene_cell( false, None,