Skip to content

Commit 8c49085

Browse files
MitMaroMitMaro
committed
Move remaining testutils to test_helpers
1 parent 5e1a39a commit 8c49085

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+549
-568
lines changed

‎src/application.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -197,16 +197,15 @@ mod tests {
197197
input::{Event, KeyCode, KeyEvent, KeyModifiers},
198198
module::Modules,
199199
runtime::{Installer, RuntimeError},
200-
test_helpers::{create_event_reader, mocks::CrossTerm},
201-
testutil::{set_git_directory, DefaultTestModule, TestModuleProvider},
200+
test_helpers::{create_event_reader, mocks, set_git_directory, DefaultTestModule, TestModuleProvider},
202201
};
203202

204203
fn args(args: &[&str]) -> Args {
205204
Args::try_from(args.iter().map(OsString::from).collect::<Vec<OsString>>()).unwrap()
206205
}
207206

208-
fn create_mocked_crossterm() -> CrossTerm {
209-
let mut crossterm = CrossTerm::new();
207+
fn create_mocked_crossterm() -> mocks::CrossTerm {
208+
let mut crossterm = mocks::CrossTerm::new();
210209
crossterm.set_size(Size::new(300, 120));
211210
crossterm
212211
}

‎src/display.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -367,18 +367,18 @@ mod tests {
367367
use rstest::rstest;
368368

369369
use super::*;
370-
use crate::test_helpers::mocks::{CrossTerm, CrosstermMockState};
370+
use crate::test_helpers::mocks;
371371

372372
#[test]
373373
fn draw_str() {
374-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
374+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
375375
display.draw_str("Test String").unwrap();
376376
assert_eq!(display.tui.get_output(), &["Test String"]);
377377
}
378378

379379
#[test]
380380
fn clear() {
381-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
381+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
382382
display.draw_str("Test String").unwrap();
383383
display.set_dim(true).unwrap();
384384
display.set_reverse(true).unwrap();
@@ -392,7 +392,7 @@ mod tests {
392392

393393
#[test]
394394
fn refresh() {
395-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
395+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
396396
display.refresh().unwrap();
397397
assert!(!display.tui.is_dirty());
398398
}
@@ -532,7 +532,7 @@ mod tests {
532532
#[case] expected_foreground: CrosstermColor,
533533
#[case] expected_background: CrosstermColor,
534534
) {
535-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
535+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
536536
display.color(display_color, selected).unwrap();
537537
assert!(
538538
display
@@ -551,7 +551,7 @@ mod tests {
551551
#[case::dim_underline(true, true, false)]
552552
#[case::all_on(true, true, true)]
553553
fn style(#[case] dim: bool, #[case] underline: bool, #[case] reverse: bool) {
554-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
554+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
555555
display.set_style(dim, underline, reverse).unwrap();
556556
assert_eq!(display.tui.is_dimmed(), dim);
557557
assert_eq!(display.tui.is_underline(), underline);
@@ -560,21 +560,21 @@ mod tests {
560560

561561
#[test]
562562
fn get_window_size() {
563-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
563+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
564564
display.tui.set_size(Size::new(12, 10));
565565
assert_eq!(display.get_window_size(), Size::new(12, 10));
566566
}
567567

568568
#[test]
569569
fn ensure_at_line_start() {
570-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
570+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
571571
display.ensure_at_line_start().unwrap();
572572
assert_eq!(display.tui.get_position(), (0, 0));
573573
}
574574

575575
#[test]
576576
fn move_from_end_of_line() {
577-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
577+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
578578
display.tui.set_size(Size::new(20, 10));
579579
display.move_from_end_of_line(5).unwrap();
580580
// character after the 15th character (0-indexed)
@@ -583,15 +583,15 @@ mod tests {
583583

584584
#[test]
585585
fn start() {
586-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
586+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
587587
display.start().unwrap();
588-
assert_eq!(display.tui.get_state(), CrosstermMockState::Normal);
588+
assert_eq!(display.tui.get_state(), mocks::CrosstermMockState::Normal);
589589
}
590590

591591
#[test]
592592
fn end() {
593-
let mut display = Display::new(CrossTerm::new(), &Theme::new());
593+
let mut display = Display::new(mocks::CrossTerm::new(), &Theme::new());
594594
display.end().unwrap();
595-
assert_eq!(display.tui.get_state(), CrosstermMockState::Ended);
595+
assert_eq!(display.tui.get_state(), mocks::CrosstermMockState::Ended);
596596
}
597597
}

‎src/editor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ mod tests {
2828
use std::{ffi::OsString, path::Path};
2929

3030
use super::*;
31-
use crate::testutil::set_git_directory;
31+
use crate::test_helpers::set_git_directory;
3232

3333
fn args(args: &[&str]) -> Args {
3434
Args::try_from(args.iter().map(OsString::from).collect::<Vec<OsString>>()).unwrap()

‎src/git/repository.rs

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -193,36 +193,25 @@ mod tests {
193193
use testutils::assert_err_eq;
194194

195195
use super::*;
196-
use crate::test_helpers::{create_commit, with_temp_bare_repository, with_temp_repository};
196+
use crate::test_helpers::{create_commit, set_git_directory, with_temp_bare_repository, with_temp_repository};
197197

198198
#[test]
199199
#[serial_test::serial]
200200
fn open_from_env() {
201-
let path = Path::new(env!("CARGO_MANIFEST_DIR"))
202-
.join("test")
203-
.join("fixtures")
204-
.join("simple");
205-
set_var("GIT_DIR", path.to_str().unwrap());
201+
_ = set_git_directory("fixtures/simple");
206202
assert_ok!(Repository::open_from_env());
207203
}
208204

209205
#[test]
210206
#[serial_test::serial]
211207
fn open_from_env_error() {
212-
let path = Path::new(env!("CARGO_MANIFEST_DIR"))
213-
.join("test")
214-
.join("fixtures")
215-
.join("does-not-exist");
216-
set_var("GIT_DIR", path.to_str().unwrap());
208+
let path = set_git_directory("fixtures/does-not-exist");
217209
assert_err_eq!(Repository::open_from_env(), GitError::RepositoryLoad {
218210
kind: RepositoryLoadKind::Environment,
219211
cause: git2::Error::new(
220212
ErrorCode::NotFound,
221213
ErrorClass::Os,
222-
format!(
223-
"failed to resolve path '{}': No such file or directory",
224-
path.to_string_lossy()
225-
)
214+
format!("failed to resolve path '{path}': No such file or directory")
226215
),
227216
});
228217
}

‎src/input/thread.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ mod tests {
9797
use crate::{
9898
input::KeyEvent,
9999
runtime::Status,
100-
test_helpers::{create_event_reader, ThreadableTester},
100+
test_helpers::{create_event_reader, testers},
101101
};
102102

103103
#[test]
@@ -131,7 +131,7 @@ mod tests {
131131
let thread: Thread<_> = Thread::new(event_provider);
132132
let state = thread.state();
133133

134-
let tester = ThreadableTester::new();
134+
let tester = testers::Threadable::new();
135135
tester.start_threadable(&thread, THREAD_NAME);
136136

137137
let event_received;
@@ -153,7 +153,7 @@ mod tests {
153153
let thread: Thread<_> = Thread::new(event_provider);
154154
let state = thread.state();
155155

156-
let tester = ThreadableTester::new();
156+
let tester = testers::Threadable::new();
157157
tester.start_threadable(&thread, THREAD_NAME);
158158
tester.wait_for_status(&Status::Busy);
159159
let event_received = state.read_event();
@@ -168,7 +168,7 @@ mod tests {
168168
let thread: Thread<_> = Thread::new(event_provider);
169169
let state = thread.state();
170170

171-
let tester = ThreadableTester::new();
171+
let tester = testers::Threadable::new();
172172
tester.start_threadable(&thread, THREAD_NAME);
173173
tester.wait_for_status(&Status::Busy);
174174
let event_received = state.read_event();
@@ -183,7 +183,7 @@ mod tests {
183183
let thread: Thread<_> = Thread::new(event_provider);
184184
let state = thread.state();
185185

186-
let tester = ThreadableTester::new();
186+
let tester = testers::Threadable::new();
187187
tester.start_threadable(&thread, THREAD_NAME);
188188
tester.wait_for_status(&Status::Busy);
189189
state.pause();

‎src/main.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,6 @@ mod search;
141141
mod test_helpers;
142142
#[cfg(test)]
143143
mod tests;
144-
#[cfg(test)]
145-
mod testutil;
146144
mod todo_file;
147145
mod util;
148146
mod version;

‎src/module/module_handler.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ mod tests {
7373
use crate::{
7474
input::StandardEvent,
7575
module::Module,
76-
testutil::{module_test, TestModuleProvider},
76+
test_helpers::{testers, TestModuleProvider},
7777
};
7878

7979
#[derive(Clone)]
@@ -124,7 +124,7 @@ mod tests {
124124

125125
#[test]
126126
fn module_lifecycle() {
127-
module_test(
127+
testers::module(
128128
&["pick aaa comment"],
129129
&[Event::Standard(StandardEvent::Exit)],
130130
|context| {
@@ -149,7 +149,7 @@ mod tests {
149149

150150
#[test]
151151
fn error() {
152-
module_test(
152+
testers::module(
153153
&["pick aaa comment"],
154154
&[Event::Standard(StandardEvent::Exit)],
155155
|context| {

‎src/module/tests.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ use anyhow::anyhow;
22

33
use crate::{
44
module::{Event, InputOptions, Module, State},
5-
test_helpers::create_test_keybindings,
6-
testutil::module_test,
5+
test_helpers::{create_test_keybindings, testers},
76
};
87

98
struct TestModule;
@@ -24,7 +23,7 @@ fn default_trait_method_deactivate() {
2423

2524
#[test]
2625
fn default_trait_method_build_view_data() {
27-
module_test(&[], &[], |context| {
26+
testers::module(&[], &[], |context| {
2827
let mut module = TestModule {};
2928
let view_data = module.build_view_data(&context.render_context);
3029
assert!(view_data.is_empty());
@@ -46,7 +45,7 @@ fn default_trait_method_read_event() {
4645

4746
#[test]
4847
fn default_trait_method_handle_event() {
49-
module_test(&[], &[], |context| {
48+
testers::module(&[], &[], |context| {
5049
let mut module = TestModule {};
5150
let mut result = module.handle_event(Event::from('a'), &context.view_context.state);
5251
assert!(result.artifact().is_none());

‎src/modules/confirm_abort.rs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ mod tests {
6363
assert_results,
6464
input::{KeyCode, StandardEvent},
6565
process::Artifact,
66-
test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
67-
testutil::module_test,
66+
test_helpers::{assertions::assert_rendered_output::AssertRenderOptions, testers},
6867
};
6968

7069
fn create_confirm_abort(todo_file: TodoFile) -> ConfirmAbort {
@@ -77,7 +76,7 @@ mod tests {
7776

7877
#[test]
7978
fn build_view_data() {
80-
module_test(&["pick aaa comment"], &[], |mut test_context| {
79+
testers::module(&["pick aaa comment"], &[], |mut test_context| {
8180
let mut module = create_confirm_abort(test_context.take_todo_file());
8281
let view_data = test_context.build_view_data(&mut module);
8382
assert_rendered_output!(
@@ -91,7 +90,7 @@ mod tests {
9190
}
9291
#[test]
9392
fn handle_event_yes() {
94-
module_test(
93+
testers::module(
9594
&["pick aaa comment"],
9695
&[Event::from(StandardEvent::Yes)],
9796
|mut test_context| {
@@ -108,7 +107,7 @@ mod tests {
108107

109108
#[test]
110109
fn handle_event_no() {
111-
module_test(
110+
testers::module(
112111
&["pick aaa comment"],
113112
&[Event::from(StandardEvent::No)],
114113
|mut test_context| {
@@ -124,7 +123,7 @@ mod tests {
124123

125124
#[test]
126125
fn handle_event_confirmed_other() {
127-
module_test(
126+
testers::module(
128127
&["pick aaa comment"],
129128
&[Event::from(KeyCode::Null)],
130129
|mut test_context| {

‎src/modules/confirm_rebase.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ mod tests {
5454
assert_results,
5555
input::{KeyCode, StandardEvent},
5656
process::Artifact,
57-
testutil::module_test,
57+
test_helpers::testers,
5858
};
5959

6060
fn create_confirm_rebase() -> ConfirmRebase {
@@ -63,7 +63,7 @@ mod tests {
6363

6464
#[test]
6565
fn build_view_data() {
66-
module_test(&["pick aaa comment"], &[], |test_context| {
66+
testers::module(&["pick aaa comment"], &[], |test_context| {
6767
let mut module = create_confirm_rebase();
6868
let view_data = test_context.build_view_data(&mut module);
6969
assert_rendered_output!(
@@ -78,7 +78,7 @@ mod tests {
7878

7979
#[test]
8080
fn handle_event_yes() {
81-
module_test(
81+
testers::module(
8282
&["pick aaa comment"],
8383
&[Event::from(StandardEvent::Yes)],
8484
|mut test_context| {
@@ -94,7 +94,7 @@ mod tests {
9494

9595
#[test]
9696
fn handle_event_no() {
97-
module_test(
97+
testers::module(
9898
&["pick aaa comment"],
9999
&[Event::from(StandardEvent::No)],
100100
|mut test_context| {
@@ -110,7 +110,7 @@ mod tests {
110110

111111
#[test]
112112
fn handle_event_no_match_key() {
113-
module_test(
113+
testers::module(
114114
&["pick aaa comment"],
115115
&[Event::from(KeyCode::Null)],
116116
|mut test_context| {

0 commit comments

Comments
 (0)