Move runtime testutils to test_helpers

Author: MitMaro

src/input/thread.rs

@@ -96,8 +96,8 @@ mod tests {
 	use super::*;
 	use crate::{
 		input::KeyEvent,
-		runtime::{testutils::ThreadableTester, Status},
-		test_helpers::create_event_reader,
+		runtime::Status,
+		test_helpers::{create_event_reader, ThreadableTester},
 	};
 
 	#[test]

src/process/tests.rs

@@ -7,8 +7,9 @@ use crate::{
 	assert_results,
 	input::{InputOptions, KeyBindings},
 	module::{Module, DEFAULT_INPUT_OPTIONS, DEFAULT_VIEW_DATA},
-	runtime::{testutils::MockNotifier, Status},
+	runtime::Status,
 	search::{Interrupter, SearchResult},
+	test_helpers::mocks::Notifier,
 	testutil::{
 		create_default_test_module_handler,
 		create_test_module_handler,
@@ -409,7 +410,7 @@ fn handle_external_command_success() {
 		create_test_module_handler(module),
 		|ProcessTestContext { process, .. }| {
 			_ = process.input_state.read_event(); // clear existing event
-			let mut notifier = MockNotifier::new(&process.thread_statuses);
+			let mut notifier = Notifier::new(&process.thread_statuses);
 			notifier.register_thread(REFRESH_THREAD_NAME, Status::Waiting);
 			notifier.register_thread(crate::input::THREAD_NAME, Status::Waiting);
 			assert_results!(process.handle_external_command(&(String::from("true"), vec![])));
@@ -428,7 +429,7 @@ fn handle_external_command_failure() {
 		create_test_module_handler(module),
 		|ProcessTestContext { process, .. }| {
 			_ = process.input_state.read_event(); // clear existing event
-			let mut notifier = MockNotifier::new(&process.thread_statuses);
+			let mut notifier = Notifier::new(&process.thread_statuses);
 			notifier.register_thread(REFRESH_THREAD_NAME, Status::Waiting);
 			notifier.register_thread(crate::input::THREAD_NAME, Status::Waiting);
 			assert_results!(process.handle_external_command(&(String::from("false"), vec![])));
@@ -455,7 +456,7 @@ fn handle_external_command_not_executable() {
 		create_test_module_handler(module),
 		|ProcessTestContext { process, .. }| {
 			_ = process.input_state.read_event(); // clear existing event
-			let mut notifier = MockNotifier::new(&process.thread_statuses);
+			let mut notifier = Notifier::new(&process.thread_statuses);
 			notifier.register_thread(REFRESH_THREAD_NAME, Status::Waiting);
 			notifier.register_thread(crate::input::THREAD_NAME, Status::Waiting);
 			assert_results!(
@@ -484,7 +485,7 @@ fn handle_external_command_not_found() {
 		create_test_module_handler(module),
 		|ProcessTestContext { process, .. }| {
 			_ = process.input_state.read_event(); // clear existing event
-			let mut notifier = MockNotifier::new(&process.thread_statuses);
+			let mut notifier = Notifier::new(&process.thread_statuses);
 			notifier.register_thread(REFRESH_THREAD_NAME, Status::Waiting);
 			notifier.register_thread(crate::input::THREAD_NAME, Status::Waiting);
 			assert_results!(
@@ -574,7 +575,7 @@ fn handle_results_external_command_success() {
 		create_test_module_handler(module),
 		|ProcessTestContext { process, .. }| {
 			_ = process.input_state.read_event(); // clear existing event
-			let mut notifier = MockNotifier::new(&process.thread_statuses);
+			let mut notifier = Notifier::new(&process.thread_statuses);
 			notifier.register_thread(REFRESH_THREAD_NAME, Status::Waiting);
 			notifier.register_thread(crate::input::THREAD_NAME, Status::Waiting);
 			let mut results = Results::new();

src/process/thread.rs

@@ -78,7 +78,8 @@ mod tests {
 	use crate::{
 		input::{Event, StandardEvent},
 		module::Module,
-		runtime::{testutils::ThreadableTester, Status},
+		runtime::Status,
+		test_helpers::ThreadableTester,
 		testutil::{create_default_test_module_handler, create_test_module_handler, process_test, ProcessTestContext},
 	};
 

src/runtime.rs

@@ -14,8 +14,7 @@ mod notifier;
 #[allow(clippy::module_inception)]
 mod runtime;
 mod status;
-#[cfg(test)]
-pub(crate) mod testutils;
+
 mod thread_statuses;
 mod threadable;
 

src/search/thread.rs

@@ -130,7 +130,7 @@ mod tests {
 	use parking_lot::Mutex;
 
 	use super::*;
-	use crate::runtime::{testutils::ThreadableTester, Status};
+	use crate::{runtime::Status, test_helpers::ThreadableTester};
 
 	#[derive(Clone)]
 	struct MockedSearchable {

src/test_helpers.rs

@@ -5,6 +5,7 @@ mod create_invalid_utf;
 mod create_test_keybindings;
 pub(crate) mod mocks;
 mod shared;
+mod threadable_tester;
 mod with_event_handler;
 mod with_git_config;
 mod with_temp_bare_repository;
@@ -17,6 +18,7 @@ pub(crate) use self::{
 	create_event_reader::create_event_reader,
 	create_invalid_utf::invalid_utf,
 	create_test_keybindings::create_test_keybindings,
+	threadable_tester::ThreadableTester,
 	with_event_handler::{with_event_handler, EventHandlerTestContext},
 	with_git_config::with_git_config,
 	with_temp_bare_repository::with_temp_bare_repository,

src/test_helpers/mocks.rs

@@ -1 +1,4 @@
 pub(crate) mod crossterm;
+mod notifier;
+
+pub(crate) use self::notifier::Notifier;

src/test_helpers/mocks/notifier.rs

@@ -0,0 +1,21 @@
+use crate::runtime::{Status, ThreadStatuses};
+
+/// A mocked version of the `Notifier`, that will interact directly with a `ThreadStatuses` without the use of a thread
+/// or the `Runtime`.
+#[derive(Debug)]
+pub(crate) struct Notifier<'notifier> {
+	threadable_statuses: &'notifier ThreadStatuses,
+}
+
+impl<'notifier> Notifier<'notifier> {
+	/// Create a new instance of a `MockNotifier`.
+	#[must_use]
+	pub(crate) const fn new(threadable_statuses: &'notifier ThreadStatuses) -> Self {
+		Self { threadable_statuses }
+	}
+
+	/// Register a thread by name and status. This does not create a thread.
+	pub(crate) fn register_thread(&mut self, thread_name: &str, status: Status) {
+		self.threadable_statuses.register_thread(thread_name, status);
+	}
+}

src/runtime/testutils.rs renamed to src/test_helpers/threadable_tester.rs

@@ -17,26 +17,6 @@ use crate::runtime::{Installer, Status, ThreadStatuses};
 
 const WAIT_TIME: Duration = Duration::from_millis(100);
 
-/// A mocked version of the `Notifier`, that will interact directly with a `ThreadStatuses` without the use of a thread
-/// or the `Runtime`.
-#[derive(Debug)]
-pub(crate) struct MockNotifier<'notifier> {
-	threadable_statuses: &'notifier ThreadStatuses,
-}
-
-impl<'notifier> MockNotifier<'notifier> {
-	/// Create a new instance of a `MockNotifier`.
-	#[must_use]
-	pub(crate) const fn new(threadable_statuses: &'notifier ThreadStatuses) -> Self {
-		Self { threadable_statuses }
-	}
-
-	/// Register a thread by name and status. This does not create a thread.
-	pub(crate) fn register_thread(&mut self, thread_name: &str, status: Status) {
-		self.threadable_statuses.register_thread(thread_name, status);
-	}
-}
-
 /// A tester utility for `Threadable`.
 #[derive(Clone, Debug)]
 pub(crate) struct ThreadableTester {

src/view/thread.rs

@@ -163,8 +163,11 @@ mod tests {
 	use crate::{
 		config::Theme,
 		display::{Display, DisplayError},
-		runtime::{testutils::ThreadableTester, Status},
-		test_helpers::mocks::crossterm::{CrossTerm, MockableTui},
+		runtime::Status,
+		test_helpers::{
+			mocks::crossterm::{CrossTerm, MockableTui},
+			ThreadableTester,
+		},
 		view::ViewData,
 	};