From c78dd2453ae09ed9c9b3eff283450df63454ac37 Mon Sep 17 00:00:00 2001
From: unspeaker <hora.nqma@protonmail.com>
Date: Mon, 27 Jan 2025 16:17:02 +0100
Subject: [PATCH] flatten model module and add tests for view

---
 Justfile                                     |  2 +-
 tek/src/lib.rs                               |  7 ++++++-
 tek/src/model.rs                             |  3 ---
 tek/src/{model/scene.rs => model_scene.rs}   |  0
 tek/src/{model/select.rs => model_select.rs} |  0
 tek/src/{model/track.rs => model_track.rs}   |  0
 tek/src/view.rs                              | 21 ++++++++++++++++++++
 7 files changed, 28 insertions(+), 5 deletions(-)
 rename tek/src/{model/scene.rs => model_scene.rs} (100%)
 rename tek/src/{model/select.rs => model_select.rs} (100%)
 rename tek/src/{model/track.rs => model_track.rs} (100%)

diff --git a/Justfile b/Justfile
index 39cde294..48b3ef3b 100644
--- a/Justfile
+++ b/Justfile
@@ -10,7 +10,7 @@ covfig := "CARGO_INCREMENTAL=0 RUSTFLAGS='-Cinstrument-coverage' RUSTDOCFLAGS='-
 cov:
   rm -rf target/coverage/html || true
   {{covfig}} time cargo test --workspace --exclude jack --profile coverage
-  {{covfig}} time grcov . --binary-path ./target/coverage/deps/ -s . -t html --branch --ignore-not-existing --ignore '../*' --ignore "/*" --ignore 'target/*' -o target/coverage/html
+  {{covfig}} time grcov . --binary-path ./target/coverage/deps/ -s . -t html --ignore-not-existing --ignore '../*' --ignore "/*" --ignore 'target/*' -o target/coverage/html
 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/tek/src/lib.rs b/tek/src/lib.rs
index f00896c0..4b612166 100644
--- a/tek/src/lib.rs
+++ b/tek/src/lib.rs
@@ -7,9 +7,14 @@
 #![feature(type_alias_impl_trait)]
 #![feature(trait_alias)]
 mod cli;   pub use self::cli::*;
-mod model; pub use self::model::*;
 mod keys;  pub use self::keys::*;
 mod audio; pub use self::audio::*;
+
+mod model; pub use self::model::*;
+mod model_track;  pub use self::model_track::*;
+mod model_scene;  pub use self::model_scene::*;
+mod model_select; pub use self::model_select::*;
+
 mod view;        pub use self::view::*;
 mod view_memo;   pub use self::view_memo::*;
 mod view_clock;  pub use self::view_clock::*;
diff --git a/tek/src/model.rs b/tek/src/model.rs
index b67b8111..0e0fa8c2 100644
--- a/tek/src/model.rs
+++ b/tek/src/model.rs
@@ -1,7 +1,4 @@
 use crate::*;
-mod scene; pub use self::scene::*;
-mod select; pub use self::select::*;
-mod track; pub use self::track::*;
 #[derive(Default, Debug)] pub struct Tek {
     /// Must not be dropped for the duration of the process
     pub jack:       Jack,
diff --git a/tek/src/model/scene.rs b/tek/src/model_scene.rs
similarity index 100%
rename from tek/src/model/scene.rs
rename to tek/src/model_scene.rs
diff --git a/tek/src/model/select.rs b/tek/src/model_select.rs
similarity index 100%
rename from tek/src/model/select.rs
rename to tek/src/model_select.rs
diff --git a/tek/src/model/track.rs b/tek/src/model_track.rs
similarity index 100%
rename from tek/src/model/track.rs
rename to tek/src/model_track.rs
diff --git a/tek/src/view.rs b/tek/src/view.rs
index a0a28069..399d5dea 100644
--- a/tek/src/view.rs
+++ b/tek/src/view.rs
@@ -137,3 +137,24 @@ impl Tek {
         Bsp::e(Tui::fg_bg(bg, Reset, "▐"), Bsp::w(Tui::fg_bg(bg, Reset, "▌"),
             Tui::fg_bg(fg, bg, content))) }
 }
+#[cfg(test)] mod test {
+    use super::*;
+    #[test] fn test_view () {
+        let app = Tek::default();
+        let _ = app.view_editor();
+        let _ = app.view_pool();
+        let _ = app.w();
+        let _ = app.w_sidebar();
+        let _ = app.w_tracks_area();
+        let _ = app.h();
+        let _ = app.h_tracks_area();
+        let _ = app.row(0, 0, "", "", "");
+        let _ = app.row_top(0, 0, "", "", "");
+        //let _ = app.io_ports(Reset, Reset, ||[].iter());
+        //let _ = app.io_connections(Reset, Reset, ||[].iter());
+        let _ = app.button2("", "");
+        let _ = app.button3("", "", "");
+        let _ = app.heading("", "", 0, "");
+        let _ = Tek::wrap(Reset, Reset, "");
+    }
+}