diff options
author | Tim Oram <dev@mitmaro.ca> | 2024-02-12 19:55:36 -0330 |
---|---|---|
committer | Tim Oram <dev@mitmaro.ca> | 2024-02-15 20:27:06 -0330 |
commit | c3c646f7d75176666e6ab581ae9bb57577d12ce7 (patch) | |
tree | f416bfbdf599b88a0416464ec9305537fbab9b1b | |
parent | c38fd360f8abcfc8607c2822944c1dccb6855f14 (diff) |
Refactor Crossterm mocks exports
-rw-r--r-- | src/application.rs | 2 | ||||
-rw-r--r-- | src/display.rs | 6 | ||||
-rw-r--r-- | src/editor.rs | 2 | ||||
-rw-r--r-- | src/test_helpers/mocks.rs | 7 | ||||
-rw-r--r-- | src/test_helpers/mocks/crossterm.rs | 14 | ||||
-rw-r--r-- | src/view/tests.rs | 2 | ||||
-rw-r--r-- | src/view/thread.rs | 2 |
7 files changed, 19 insertions, 16 deletions
diff --git a/src/application.rs b/src/application.rs index 174ce7d..8a88a3c 100644 --- a/src/application.rs +++ b/src/application.rs @@ -197,7 +197,7 @@ mod tests { input::{Event, KeyCode, KeyEvent, KeyModifiers}, module::Modules, runtime::{Installer, RuntimeError}, - test_helpers::{create_event_reader, mocks::crossterm::CrossTerm}, + test_helpers::{create_event_reader, mocks::CrossTerm}, testutil::{set_git_directory, DefaultTestModule, TestModuleProvider}, }; diff --git a/src/display.rs b/src/display.rs index c132bcf..657cf4e 100644 --- a/src/display.rs +++ b/src/display.rs @@ -367,7 +367,7 @@ mod tests { use rstest::rstest; use super::*; - use crate::test_helpers::mocks::crossterm::{CrossTerm, State}; + use crate::test_helpers::mocks::{CrossTerm, CrosstermMockState}; #[test] fn draw_str() { @@ -585,13 +585,13 @@ mod tests { fn start() { let mut display = Display::new(CrossTerm::new(), &Theme::new()); display.start().unwrap(); - assert_eq!(display.tui.get_state(), State::Normal); + assert_eq!(display.tui.get_state(), CrosstermMockState::Normal); } #[test] fn end() { let mut display = Display::new(CrossTerm::new(), &Theme::new()); display.end().unwrap(); - assert_eq!(display.tui.get_state(), State::Ended); + assert_eq!(display.tui.get_state(), CrosstermMockState::Ended); } } diff --git a/src/editor.rs b/src/editor.rs index da36b5a..4c6d77f 100644 --- a/src/editor.rs +++ b/src/editor.rs @@ -1,7 +1,7 @@ #[cfg(not(test))] use crate::display::CrossTerm; #[cfg(test)] -use crate::test_helpers::mocks::crossterm::CrossTerm; +use crate::test_helpers::mocks::CrossTerm; use crate::{ application::Application, arguments::Args, diff --git a/src/test_helpers/mocks.rs b/src/test_helpers/mocks.rs index 8f873df..a24c1dc 100644 --- a/src/test_helpers/mocks.rs +++ b/src/test_helpers/mocks.rs @@ -1,4 +1,7 @@ -pub(crate) mod crossterm; +mod crossterm; mod notifier; -pub(crate) use self::notifier::Notifier; +pub(crate) use self::{ + crossterm::{CrossTerm, CrosstermMockState, MockableTui}, + notifier::Notifier, +}; diff --git a/src/test_helpers/mocks/crossterm.rs b/src/test_helpers/mocks/crossterm.rs index 134a562..825bf05 100644 --- a/src/test_helpers/mocks/crossterm.rs +++ b/src/test_helpers/mocks/crossterm.rs @@ -8,7 +8,7 @@ use crate::display::{ColorMode, DisplayError, Size, Tui}; /// The state of the `CrossTerm` instance. #[derive(Copy, Clone, Debug, PartialEq, Eq)] #[allow(clippy::exhaustive_enums)] -pub(crate) enum State { +pub(crate) enum CrosstermMockState { /// The TUI is new and unchanged. New, /// The TUI is in the normal mode. @@ -138,7 +138,7 @@ struct CrossTermInternalState { output: Vec<String>, position: (u16, u16), size: Size, - state: State, + state: CrosstermMockState, } /// A mocked version of `CrossTerm`, useful for testing. @@ -157,7 +157,7 @@ impl MockableTui for CrossTerm { state.attributes = Attributes::from(Attribute::Reset); state.colors = Colors::new(Color::Reset, Color::Reset); state.output.clear(); - state.state = State::Normal; + state.state = CrosstermMockState::Normal; Ok(()) } @@ -224,12 +224,12 @@ impl MockableTui for CrossTerm { } fn start(&mut self) -> Result<(), DisplayError> { - self.state.write().state = State::Normal; + self.state.write().state = CrosstermMockState::Normal; Ok(()) } fn end(&mut self) -> Result<(), DisplayError> { - self.state.write().state = State::Ended; + self.state.write().state = CrosstermMockState::Ended; Ok(()) } } @@ -247,7 +247,7 @@ impl CrossTerm { output: vec![], position: (0, 0), size: Size::new(10, 10), - state: State::New, + state: CrosstermMockState::New, })), } } @@ -260,7 +260,7 @@ impl CrossTerm { /// Get the current state. #[must_use] - pub(crate) fn get_state(&self) -> State { + pub(crate) fn get_state(&self) -> CrosstermMockState { self.state.read().state } diff --git a/src/view/tests.rs b/src/view/tests.rs index 515068d..f6c9aba 100644 --- a/src/view/tests.rs +++ b/src/view/tests.rs @@ -1,5 +1,5 @@ use super::*; -use crate::{config::Theme, display::Size, test_helpers::mocks::crossterm::CrossTerm}; +use crate::{config::Theme, display::Size, test_helpers::mocks::CrossTerm}; fn assert_render(width: usize, height: usize, view_data: &ViewData, expected: &[&str]) { let theme = Theme::new(); diff --git a/src/view/thread.rs b/src/view/thread.rs index 8611b6b..dd94e66 100644 --- a/src/view/thread.rs +++ b/src/view/thread.rs @@ -165,7 +165,7 @@ mod tests { display::{Display, DisplayError}, runtime::Status, test_helpers::{ - mocks::crossterm::{CrossTerm, MockableTui}, + mocks::{CrossTerm, MockableTui}, ThreadableTester, }, view::ViewData, |