refactor

8 files changed, 20 insertions, 20 deletions

diff --git a/Cargo.toml b/Cargo.toml
index ade2424..fa36d26 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,7 +7,7 @@ repository = "https://github.com/Byron/dua-cli"
 readme = "README.md"
 description = "A tool to conveniently learn about the disk usage of directories, fast!"
 license = "MIT"
-include = ["src/**/*", "Cargo.*", "LICENSE", "README.md", "CHANGELOG.md", "!**/*_test/*"]
+include = ["src/**/*", "Cargo.*", "LICENSE", "README.md", "CHANGELOG.md", "!**/tests/*"]
 
 [features]
 default = ["tui-crossplatform"]
diff --git a/src/interactive/app/mod.rs b/src/interactive/app/mod.rs
index 36ba14e..7959646 100644
--- a/src/interactive/app/mod.rs
+++ b/src/interactive/app/mod.rs
@@ -7,3 +7,6 @@ pub use bytevis::*;
 pub use common::*;
 pub use eventloop::*;
 pub use handlers::*;
+
+#[cfg(test)]
+mod tests;
diff --git a/src/interactive/app_test/journeys_readonly.rs b/src/interactive/app/tests/journeys_readonly.rs
index 28d94e6..f704742 100644
--- a/src/interactive/app_test/journeys_readonly.rs
+++ b/src/interactive/app/tests/journeys_readonly.rs
@@ -1,15 +1,14 @@
-use crate::interactive::{
-    app_test::utils::{
-        fixture_str, index_by_name, initialized_app_and_terminal_from_fixture, into_keys,
-        node_by_index, node_by_name,
-    },
-    app_test::FIXTURE_PATH,
-    SortMode,
-};
 use anyhow::Result;
 use pretty_assertions::assert_eq;
 use std::ffi::OsString;
 
+use crate::interactive::app::tests::utils::{
+    fixture_str, index_by_name, initialized_app_and_terminal_from_fixture, into_keys,
+    node_by_index, node_by_name,
+};
+use crate::interactive::app::tests::FIXTURE_PATH;
+use crate::interactive::SortMode;
+
 #[test]
 fn simple_user_journey_read_only() -> Result<()> {
     let long_root = "sample-02/dir";
diff --git a/src/interactive/app_test/journeys_with_writes.rs b/src/interactive/app/tests/journeys_with_writes.rs
index 83238b2..9ea65d6 100644
--- a/src/interactive/app_test/journeys_with_writes.rs
+++ b/src/interactive/app/tests/journeys_with_writes.rs
@@ -1,4 +1,4 @@
-use crate::interactive::app_test::utils::{
+use crate::interactive::app::tests::utils::{
     initialized_app_and_terminal_from_paths, into_keys, WritableFixture,
 };
 use anyhow::Result;
diff --git a/src/interactive/app_test/mod.rs b/src/interactive/app/tests/mod.rs
index ef6efb5..ef6efb5 100644
--- a/src/interactive/app_test/mod.rs
+++ b/src/interactive/app/tests/mod.rs
diff --git a/src/interactive/app_test/unit.rs b/src/interactive/app/tests/unit.rs
index e27d456..3032e4f 100644
--- a/src/interactive/app_test/unit.rs
+++ b/src/interactive/app/tests/unit.rs
@@ -1,4 +1,4 @@
-use crate::interactive::app_test::utils::{
+use crate::interactive::app::tests::utils::{
     debug, initialized_app_and_terminal_from_fixture, sample_01_tree, sample_02_tree,
 };
 use anyhow::Result;
diff --git a/src/interactive/app_test/utils.rs b/src/interactive/app/tests/utils.rs
index 454acc2..26241d4 100644
--- a/src/interactive/app_test/utils.rs
+++ b/src/interactive/app/tests/utils.rs
@@ -1,4 +1,3 @@
-use crate::interactive::{app_test::FIXTURE_PATH, Interaction, TerminalApp};
 use anyhow::{Context, Error, Result};
 use dua::{
     traverse::{EntryData, Tree, TreeIndex},
@@ -18,6 +17,8 @@ use std::{
 use tui::backend::TestBackend;
 use tui_react::Terminal;
 
+use crate::interactive::{app::tests::FIXTURE_PATH, Interaction, TerminalApp};
+
 pub fn into_keys<'a>(
     bytes: impl Iterator<Item = &'a u8> + 'a,
 ) -> impl Iterator<Item = crosstermion::input::Key> + 'a {
@@ -160,8 +161,8 @@ pub fn fixture_str(p: impl AsRef<Path>) -> String {
     fixture(p).to_str().unwrap().to_owned()
 }
 
-pub fn initialized_app_and_terminal_with_closure<P: AsRef<Path>>(
-    fixture_paths: &[P],
+pub fn initialized_app_and_terminal_with_closure(
+    fixture_paths: &[impl AsRef<Path>],
     mut convert: impl FnMut(&Path) -> PathBuf,
 ) -> Result<(Terminal<TestBackend>, TerminalApp), Error> {
     let mut terminal = new_test_terminal()?;
diff --git a/src/interactive/mod.rs b/src/interactive/mod.rs
index 07c2036..81f8fa3 100644
--- a/src/interactive/mod.rs
+++ b/src/interactive/mod.rs
@@ -1,7 +1,7 @@
 mod app;
-pub mod widgets;
+pub use app::*;
 
-pub use self::app::*;
+pub mod widgets;
 
 mod utils {
     use dua::{
@@ -29,7 +29,4 @@ mod utils {
             })
     }
 }
-pub use utils::*;
-
-#[cfg(test)]
-mod app_test;
+pub use utils::path_of;