Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix warnings in tests

Browse source
This commit is contained in:
Piotr Osiewicz 2023-11-20 19:25:14 +01:00
parent d60855b06d
commit fe0a8b4be2
1 changed files with 70 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

134
crates/search2/src/buffer_search.rs
View file

@ -909,7 +909,7 @@ mod tests {
.unindent(), .unindent(),
) )
}); });
let (window, cx) = cx.add_window_view(|_| EmptyView {}); let (_, cx) = cx.add_window_view(|_| EmptyView {});
let editor = cx.build_view(|cx| Editor::for_buffer(buffer.clone(), None, cx)); let editor = cx.build_view(|cx| Editor::for_buffer(buffer.clone(), None, cx));
let search_bar = cx.build_view(|cx| { let search_bar = cx.build_view(|cx| {
@ -1324,56 +1324,60 @@ mod tests {
initial_selections initial_selections
}).unwrap(); }).unwrap();
window.update(cx, |_, cx| { window
assert!( .update(cx, |_, cx| {
editor.read(cx).is_focused(cx), assert!(
"Should still have editor focused after SelectNextMatch" editor.read(cx).is_focused(cx),
); "Should still have editor focused after SelectNextMatch"
search_bar.update(cx, |search_bar, cx| {
let all_selections =
editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
assert_eq!(
all_selections.len(),
1,
"On next match, should deselect items and select the next match"
); );
assert_ne!( search_bar.update(cx, |search_bar, cx| {
all_selections, initial_selections, let all_selections =
"Next match should be different from the first selection" editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
assert_eq!(
all_selections.len(),
1,
"On next match, should deselect items and select the next match"
);
assert_ne!(
all_selections, initial_selections,
"Next match should be different from the first selection"
);
assert_eq!(
search_bar.active_match_index,
Some(1),
"Match index should be updated to the next one"
);
let handle = search_bar.query_editor.focus_handle(cx);
cx.focus(&handle);
search_bar.select_all_matches(&SelectAllMatches, cx);
});
})
.unwrap();
window
.update(cx, |_, cx| {
assert!(
editor.read(cx).is_focused(cx),
"Should focus editor after successful SelectAllMatches"
); );
assert_eq!( search_bar.update(cx, |search_bar, cx| {
search_bar.active_match_index, let all_selections =
Some(1), editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
"Match index should be updated to the next one" assert_eq!(
);
let handle = search_bar.query_editor.focus_handle(cx);
cx.focus(&handle);
search_bar.select_all_matches(&SelectAllMatches, cx);
});
});
window.update(cx, |_, cx| {
assert!(
editor.read(cx).is_focused(cx),
"Should focus editor after successful SelectAllMatches"
);
search_bar.update(cx, |search_bar, cx| {
let all_selections =
editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
assert_eq!(
all_selections.len(), all_selections.len(),
expected_query_matches_count, expected_query_matches_count,
"Should select all `a` characters in the buffer, but got: {all_selections:?}" "Should select all `a` characters in the buffer, but got: {all_selections:?}"
); );
assert_eq!( assert_eq!(
search_bar.active_match_index, search_bar.active_match_index,
Some(1), Some(1),
"Match index should not change after selecting all matches" "Match index should not change after selecting all matches"
); );
}); });
search_bar.update(cx, |search_bar, cx| { search_bar.update(cx, |search_bar, cx| {
search_bar.select_prev_match(&SelectPrevMatch, cx); search_bar.select_prev_match(&SelectPrevMatch, cx);
}); });
}); })
.unwrap();
let last_match_selections = window let last_match_selections = window
.update(cx, |_, cx| { .update(cx, |_, cx| {
assert!( assert!(
@ -1414,27 +1418,29 @@ mod tests {
.unwrap() .unwrap()
.await .await
.unwrap(); .unwrap();
window.update(cx, |_, cx| { window
search_bar.update(cx, |search_bar, cx| { .update(cx, |_, cx| {
search_bar.select_all_matches(&SelectAllMatches, cx); search_bar.update(cx, |search_bar, cx| {
}); search_bar.select_all_matches(&SelectAllMatches, cx);
assert!( });
assert!(
editor.update(cx, |this, cx| !this.is_focused(cx.window_context())), editor.update(cx, |this, cx| !this.is_focused(cx.window_context())),
"Should not switch focus to editor if SelectAllMatches does not find any matches" "Should not switch focus to editor if SelectAllMatches does not find any matches"
); );
search_bar.update(cx, |search_bar, cx| { search_bar.update(cx, |search_bar, cx| {
let all_selections = let all_selections =
editor.update(cx, |editor, cx| editor.selections.display_ranges(cx)); editor.update(cx, |editor, cx| editor.selections.display_ranges(cx));
assert_eq!( assert_eq!(
all_selections, last_match_selections, all_selections, last_match_selections,
"Should not select anything new if there are no matches" "Should not select anything new if there are no matches"
); );
assert!( assert!(
search_bar.active_match_index.is_none(), search_bar.active_match_index.is_none(),
"For no matches, there should be no active match index" "For no matches, there should be no active match index"
); );
}); });
}); })
.unwrap();
} }
#[gpui::test] #[gpui::test]
@ -1449,7 +1455,7 @@ mod tests {
"# "#
.unindent(); .unindent();
let buffer = cx.build_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), buffer_text)); let buffer = cx.build_model(|cx| Buffer::new(0, cx.entity_id().as_u64(), buffer_text));
let (window, cx) = cx.add_window_view(|_| EmptyView {}); let (_, cx) = cx.add_window_view(|_| EmptyView {});
let editor = cx.build_view(|cx| Editor::for_buffer(buffer.clone(), None, cx)); let editor = cx.build_view(|cx| Editor::for_buffer(buffer.clone(), None, cx));