summaryrefslogtreecommitdiffstats
path: root/src/modules/list/tests
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/list/tests')
-rw-r--r--src/modules/list/tests/abort_and_rebase.rs2
-rw-r--r--src/modules/list/tests/activate.rs5
-rw-r--r--src/modules/list/tests/change_action.rs2
-rw-r--r--src/modules/list/tests/edit_mode.rs2
-rw-r--r--src/modules/list/tests/external_editor.rs2
-rw-r--r--src/modules/list/tests/help.rs2
-rw-r--r--src/modules/list/tests/insert_line.rs2
-rw-r--r--src/modules/list/tests/movement.rs3
-rw-r--r--src/modules/list/tests/normal_mode.rs9
-rw-r--r--src/modules/list/tests/read_event.rs17
-rw-r--r--src/modules/list/tests/remove_lines.rs2
-rw-r--r--src/modules/list/tests/render.rs2
-rw-r--r--src/modules/list/tests/search.rs2
-rw-r--r--src/modules/list/tests/show_commit.rs2
-rw-r--r--src/modules/list/tests/swap_lines.rs2
-rw-r--r--src/modules/list/tests/toggle_break.rs7
-rw-r--r--src/modules/list/tests/toggle_option.rs1
-rw-r--r--src/modules/list/tests/undo_redo.rs2
-rw-r--r--src/modules/list/tests/visual_mode.rs24
19 files changed, 35 insertions, 55 deletions
diff --git a/src/modules/list/tests/abort_and_rebase.rs b/src/modules/list/tests/abort_and_rebase.rs
index e064105..8746347 100644
--- a/src/modules/list/tests/abort_and_rebase.rs
+++ b/src/modules/list/tests/abort_and_rebase.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_results, process::Artifact, test_helpers::testers};
+use crate::{assert_results, process::Artifact};
#[test]
fn normal_mode_abort() {
diff --git a/src/modules/list/tests/activate.rs b/src/modules/list/tests/activate.rs
index 24dd42e..10b5c49 100644
--- a/src/modules/list/tests/activate.rs
+++ b/src/modules/list/tests/activate.rs
@@ -4,8 +4,7 @@ use super::*;
use crate::{
assert_results,
process::Artifact,
- search::{Interrupter, SearchResult, Searchable},
- test_helpers::{create_config, testers},
+ search::{Interrupter, SearchResult},
};
#[derive(Clone)]
@@ -14,7 +13,7 @@ struct MockedSearchable;
impl Searchable for MockedSearchable {
fn reset(&mut self) {}
- fn search(&mut self, _: Interrupter, term: &str) -> SearchResult {
+ fn search(&mut self, _: Interrupter, _: &str) -> SearchResult {
SearchResult::None
}
}
diff --git a/src/modules/list/tests/change_action.rs b/src/modules/list/tests/change_action.rs
index 215fd10..b7200be 100644
--- a/src/modules/list/tests/change_action.rs
+++ b/src/modules/list/tests/change_action.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{action_line, assert_rendered_output, test_helpers::testers};
+use crate::{action_line, assert_rendered_output};
#[test]
fn normal_mode_action_change_to_drop() {
diff --git a/src/modules/list/tests/edit_mode.rs b/src/modules/list/tests/edit_mode.rs
index 4736a83..579f0aa 100644
--- a/src/modules/list/tests/edit_mode.rs
+++ b/src/modules/list/tests/edit_mode.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_rendered_output, assert_results, input::KeyCode, process::Artifact, test_helpers::testers};
+use crate::{assert_rendered_output, assert_results, input::KeyCode, process::Artifact};
#[test]
fn edit_with_edit_content() {
diff --git a/src/modules/list/tests/external_editor.rs b/src/modules/list/tests/external_editor.rs
index 8b0e58c..2cd93fd 100644
--- a/src/modules/list/tests/external_editor.rs
+++ b/src/modules/list/tests/external_editor.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_results, process::Artifact, test_helpers::testers};
+use crate::{assert_results, process::Artifact};
#[test]
fn normal_mode_open_external_editor() {
diff --git a/src/modules/list/tests/help.rs b/src/modules/list/tests/help.rs
index 3ffb99e..78ec6ac 100644
--- a/src/modules/list/tests/help.rs
+++ b/src/modules/list/tests/help.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_rendered_output, input::KeyCode, test_helpers::testers};
+use crate::{assert_rendered_output, input::KeyCode};
#[test]
fn normal_mode_help() {
diff --git a/src/modules/list/tests/insert_line.rs b/src/modules/list/tests/insert_line.rs
index 119526b..e3ec818 100644
--- a/src/modules/list/tests/insert_line.rs
+++ b/src/modules/list/tests/insert_line.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_results, process::Artifact, test_helpers::testers};
+use crate::{assert_results, process::Artifact};
#[test]
fn insert_line() {
diff --git a/src/modules/list/tests/movement.rs b/src/modules/list/tests/movement.rs
index 03b055f..77a3fed 100644
--- a/src/modules/list/tests/movement.rs
+++ b/src/modules/list/tests/movement.rs
@@ -2,8 +2,7 @@ use super::*;
use crate::{
action_line,
assert_rendered_output,
- input::{KeyModifiers, MouseEvent, MouseEventKind},
- test_helpers::testers,
+ input::{KeyModifiers, MouseEvent},
};
#[test]
diff --git a/src/modules/list/tests/normal_mode.rs b/src/modules/list/tests/normal_mode.rs
index ec4306b..7e277ec 100644
--- a/src/modules/list/tests/normal_mode.rs
+++ b/src/modules/list/tests/normal_mode.rs
@@ -1,12 +1,5 @@
use super::*;
-use crate::{
- action_line,
- assert_rendered_output,
- assert_results,
- input::KeyCode,
- process::Artifact,
- test_helpers::testers,
-};
+use crate::{action_line, assert_rendered_output, assert_results, input::KeyCode, process::Artifact};
#[test]
fn change_auto_select_next_with_next_line() {
diff --git a/src/modules/list/tests/read_event.rs b/src/modules/list/tests/read_event.rs
index 63646c6..a2aa411 100644
--- a/src/modules/list/tests/read_event.rs
+++ b/src/modules/list/tests/read_event.rs
@@ -1,10 +1,7 @@
use rstest::rstest;
use super::*;
-use crate::{
- input::{KeyCode, KeyModifiers, MouseEvent},
- test_helpers::testers,
-};
+use crate::input::{KeyCode, KeyModifiers, MouseEvent};
#[test]
fn edit_mode_passthrough_event() {
@@ -63,7 +60,7 @@ fn search() {
#[case::togglevisualmode('v', StandardEvent::ToggleVisualMode)]
fn default_events_single_char(#[case] binding: char, #[case] expected: StandardEvent) {
testers::read_event(Event::from(binding), |mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), Event::from(expected));
});
}
@@ -80,7 +77,7 @@ fn default_events_single_char(#[case] binding: char, #[case] expected: StandardE
#[case::delete(KeyCode::Delete, StandardEvent::Delete)]
fn default_events_special(#[case] code: KeyCode, #[case] expected: StandardEvent) {
testers::read_event(Event::from(code), |mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), Event::from(expected));
});
}
@@ -118,7 +115,7 @@ fn mouse_move_down() {
modifiers: KeyModifiers::empty(),
}),
|mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), Event::from(StandardEvent::MoveCursorDown));
},
);
@@ -134,7 +131,7 @@ fn mouse_move_up() {
modifiers: KeyModifiers::empty(),
}),
|mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), Event::from(StandardEvent::MoveCursorUp));
},
);
@@ -149,7 +146,7 @@ fn mouse_other() {
modifiers: KeyModifiers::empty(),
});
testers::read_event(mouse_event, |mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), mouse_event);
});
}
@@ -157,7 +154,7 @@ fn mouse_other() {
#[test]
fn event_other() {
testers::read_event(Event::None, |mut context| {
- let mut module = create_list(&create_config(), context.take_todo_file());
+ let module = create_list(&create_config(), context.take_todo_file());
assert_eq!(context.read_event(&module), Event::None);
});
}
diff --git a/src/modules/list/tests/remove_lines.rs b/src/modules/list/tests/remove_lines.rs
index 7b82bc5..16e3a8b 100644
--- a/src/modules/list/tests/remove_lines.rs
+++ b/src/modules/list/tests/remove_lines.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{action_line, assert_rendered_output, test_helpers::testers};
+use crate::{action_line, assert_rendered_output};
#[test]
fn normal_mode_remove_line_first() {
diff --git a/src/modules/list/tests/render.rs b/src/modules/list/tests/render.rs
index c78d5eb..79e6da8 100644
--- a/src/modules/list/tests/render.rs
+++ b/src/modules/list/tests/render.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_rendered_output, test_helpers::testers};
+use crate::{assert_rendered_output, test_helpers::assertions::assert_rendered_output::AssertRenderOptions};
#[test]
fn empty_list() {
diff --git a/src/modules/list/tests/search.rs b/src/modules/list/tests/search.rs
index 8740efd..8b1fc7b 100644
--- a/src/modules/list/tests/search.rs
+++ b/src/modules/list/tests/search.rs
@@ -287,7 +287,7 @@ fn search_indicator_refresh_on_update() {
#[test]
fn start_edit() {
- search_test(&[Action::Start("")], &["pick aaaaaaaa comment"], |mut test_context| {
+ search_test(&[Action::Start("")], &["pick aaaaaaaa comment"], |test_context| {
assert!(test_context.list.search_bar.is_active());
});
}
diff --git a/src/modules/list/tests/show_commit.rs b/src/modules/list/tests/show_commit.rs
index e9ee1c1..84c5691 100644
--- a/src/modules/list/tests/show_commit.rs
+++ b/src/modules/list/tests/show_commit.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{assert_results, process::Artifact, test_helpers::testers};
+use crate::{assert_results, process::Artifact};
#[test]
fn when_hash_available() {
diff --git a/src/modules/list/tests/swap_lines.rs b/src/modules/list/tests/swap_lines.rs
index b84d28a..93fda8f 100644
--- a/src/modules/list/tests/swap_lines.rs
+++ b/src/modules/list/tests/swap_lines.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{action_line, assert_rendered_output, test_helpers::testers};
+use crate::{action_line, assert_rendered_output};
#[test]
fn normal_mode_change_swap_down() {
diff --git a/src/modules/list/tests/toggle_break.rs b/src/modules/list/tests/toggle_break.rs
index ac5dd1b..8c4ac37 100644
--- a/src/modules/list/tests/toggle_break.rs
+++ b/src/modules/list/tests/toggle_break.rs
@@ -1,10 +1,5 @@
use super::*;
-use crate::{
- action_line,
- assert_rendered_output,
- test_helpers::testers,
- todo_file::{Action::Pick, ParseError},
-};
+use crate::{action_line, assert_rendered_output};
#[test]
fn change_toggle_break_add() {
diff --git a/src/modules/list/tests/toggle_option.rs b/src/modules/list/tests/toggle_option.rs
index 5cc38a0..f1c75ce 100644
--- a/src/modules/list/tests/toggle_option.rs
+++ b/src/modules/list/tests/toggle_option.rs
@@ -1,7 +1,6 @@
use claims::{assert_none, assert_some, assert_some_eq};
use super::*;
-use crate::test_helpers::testers;
#[test]
fn on_fixup_keep_message() {
diff --git a/src/modules/list/tests/undo_redo.rs b/src/modules/list/tests/undo_redo.rs
index 2aaaf92..cf83fcb 100644
--- a/src/modules/list/tests/undo_redo.rs
+++ b/src/modules/list/tests/undo_redo.rs
@@ -1,5 +1,5 @@
use super::*;
-use crate::{action_line, assert_rendered_output, assert_results, process::Artifact, test_helpers::testers};
+use crate::{action_line, assert_rendered_output, assert_results, process::Artifact};
#[test]
fn normal_mode_undo() {
diff --git a/src/modules/list/tests/visual_mode.rs b/src/modules/list/tests/visual_mode.rs
index ffebd26..c7f1741 100644
--- a/src/modules/list/tests/visual_mode.rs
+++ b/src/modules/list/tests/visual_mode.rs
@@ -6,7 +6,7 @@ use crate::{
input::KeyCode,
process::Artifact,
render_line,
- test_helpers::{assertions::assert_rendered_output::AssertRenderOptions, testers},
+ test_helpers::assertions::assert_rendered_output::AssertRenderOptions,
};
fn render_options() -> AssertRenderOptions {
@@ -21,7 +21,6 @@ fn start() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
Options render_options(),
test_context.build_view_data(&mut module),
@@ -44,9 +43,9 @@ fn start_cursor_down_one() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
- Options render_options(),test_context.build_view_data(&mut module),
+ Options render_options(),
+ test_context.build_view_data(&mut module),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Pick "aaa", "c1")),
render_line!(All render_line!(Not Contains "Dimmed"), action_line!(Selected Pick "aaa", "c2")),
action_line!(Pick "aaa", "c3")
@@ -73,9 +72,9 @@ fn start_cursor_page_down() {
let mut module = create_list(&create_config(), test_context.take_todo_file());
module.height = 4;
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
- Options render_options(),test_context.build_view_data(&mut module),
+ Options render_options(),
+ test_context.build_view_data(&mut module),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Pick "aaa", "c1")),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Pick "aaa", "c2")),
render_line!(All render_line!(Not Contains "Dimmed"), action_line!(Selected Pick "aaa", "c3")),
@@ -107,9 +106,9 @@ fn start_cursor_from_bottom_move_up() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
- Options render_options(),test_context.build_view_data(&mut module),
+ Options render_options(),
+ test_context.build_view_data(&mut module),
action_line!(Pick "aaa", "c1"),
action_line!(Pick "aaa", "c2"),
action_line!(Pick "aaa", "c3"),
@@ -144,9 +143,9 @@ fn start_cursor_from_bottom_to_top() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
- Options render_options(),test_context.build_view_data(&mut module),
+ Options render_options(),
+ test_context.build_view_data(&mut module),
render_line!(All render_line!(Not Contains "Dimmed"), action_line!(Selected Pick "aaa", "c1")),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Pick "aaa", "c2")),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Pick "aaa", "c3")),
@@ -170,7 +169,6 @@ fn action_change_top_bottom() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
Options render_options(),
test_context.build_view_data(&mut module),
@@ -197,9 +195,9 @@ fn action_change_bottom_top() {
|mut test_context| {
let mut module = create_list(&create_config(), test_context.take_todo_file());
_ = test_context.handle_all_events(&mut module);
- let view_data = test_context.build_view_data(&mut module);
assert_rendered_output!(
- Options render_options(),test_context.build_view_data(&mut module),
+ Options render_options(),
+ test_context.build_view_data(&mut module),
render_line!(All render_line!(Not Contains "Dimmed"), action_line!(Selected Reword "aaa", "c1")),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Reword "aaa", "c2")),
render_line!(All render_line!(Contains "Dimmed"), action_line!(Selected Reword "aaa", "c3"))
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-04 13:12:07 +0000