diff options
| author | a-kenji <aks.kenji@protonmail.com> | 2021-05-27 13:28:59 +0200 |
|---|---|---|
| committer | a-kenji <aks.kenji@protonmail.com> | 2021-05-27 15:49:50 +0200 |
| commit | 81b026df249c72057ed9ae9e8b4140c2ff6db160 (patch) | |
| tree | a0f28e0ebbf017b53acc41d2a2094886c4781acd /src/tests | |
| parent | Default mode 368 (diff) | |
| parent | Docs(changelog): Detachable sessions #531 (diff) | |
| download | sl0ppij-81b026df249c72057ed9ae9e8b4140c2ff6db160.tar.gz sl0ppij-81b026df249c72057ed9ae9e8b4140c2ff6db160.tar.xz sl0ppij-81b026df249c72057ed9ae9e8b4140c2ff6db160.zip | |
Merge branch 'main' of https://github.com/zellij-org/zellij into default-mode-368
* If starting in the locked mode after the merge,
the locked mode seems to need 2 actions to go to
the normal mode - after that everything works
as expected.
- This is not intended.
Diffstat (limited to 'src/tests')
| -rw-r--r-- | src/tests/fakes.rs | 112 | ||||
| -rw-r--r-- | src/tests/integration/basic.rs | 21 | ||||
| -rw-r--r-- | src/tests/integration/close_pane.rs | 20 | ||||
| -rw-r--r-- | src/tests/integration/compatibility.rs | 27 | ||||
| -rw-r--r-- | src/tests/integration/layouts.rs | 10 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_down.rs | 9 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_left.rs | 10 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_right.rs | 10 | ||||
| -rw-r--r-- | src/tests/integration/move_focus_up.rs | 9 | ||||
| -rw-r--r-- | src/tests/integration/resize_down.rs | 20 | ||||
| -rw-r--r-- | src/tests/integration/resize_left.rs | 20 | ||||
| -rw-r--r-- | src/tests/integration/resize_right.rs | 20 | ||||
| -rw-r--r-- | src/tests/integration/resize_up.rs | 20 | ||||
| -rw-r--r-- | src/tests/integration/tabs.rs | 16 | ||||
| -rw-r--r-- | src/tests/integration/terminal_window_resize.rs | 11 | ||||
| -rw-r--r-- | src/tests/integration/toggle_fullscreen.rs | 9 | ||||
| -rw-r--r-- | src/tests/mod.rs | 21 | ||||
| -rw-r--r-- | src/tests/utils.rs | 9 |
18 files changed, 168 insertions, 206 deletions
diff --git a/src/tests/fakes.rs b/src/tests/fakes.rs index eb0d14e8..23f9f182 100644 --- a/src/tests/fakes.rs +++ b/src/tests/fakes.rs @@ -1,5 +1,3 @@ -use crate::panes::PositionAndSize; -use interprocess::local_socket::LocalSocketStream; use std::collections::{HashMap, VecDeque}; use std::io::Write; use std::os::unix::io::RawFd; @@ -7,21 +5,28 @@ use std::path::PathBuf; use std::sync::{mpsc, Arc, Condvar, Mutex}; use std::time::{Duration, Instant}; -use crate::client::ClientInstruction; -use crate::common::thread_bus::{ChannelWithContext, SenderType, SenderWithContext}; -use crate::errors::ErrorContext; -use crate::os_input_output::{ClientOsApi, ServerOsApi}; -use crate::server::ServerInstruction; +use zellij_utils::{nix, zellij_tile}; + use crate::tests::possible_tty_inputs::{get_possible_tty_inputs, Bytes}; use crate::tests::utils::commands::{QUIT, SLEEP}; -use crate::utils::shared::default_palette; +use zellij_client::os_input_output::ClientOsApi; +use zellij_server::os_input_output::{async_trait, AsyncReader, Pid, ServerOsApi}; use zellij_tile::data::Palette; +use zellij_utils::{ + async_std, + channels::{ChannelWithContext, SenderType, SenderWithContext}, + errors::ErrorContext, + interprocess::local_socket::LocalSocketStream, + ipc::{ClientToServerMsg, ServerToClientMsg}, + pane_size::PositionAndSize, + shared::default_palette, +}; const MIN_TIME_BETWEEN_SNAPSHOTS: Duration = Duration::from_millis(150); #[derive(Clone)] pub enum IoEvent { - Kill(RawFd), + Kill(Pid), SetTerminalSizeUsingFd(RawFd, u16, u16), IntoRawMode(RawFd), UnsetRawMode(RawFd), @@ -77,10 +82,10 @@ pub struct FakeInputOutput { win_sizes: Arc<Mutex<HashMap<RawFd, PositionAndSize>>>, possible_tty_inputs: HashMap<u16, Bytes>, last_snapshot_time: Arc<Mutex<Instant>>, - send_instructions_to_client: SenderWithContext<ClientInstruction>, - receive_instructions_from_server: Arc<Mutex<mpsc::Receiver<(ClientInstruction, ErrorContext)>>>, - send_instructions_to_server: SenderWithContext<ServerInstruction>, - receive_instructions_from_client: Arc<Mutex<mpsc::Receiver<(ServerInstruction, ErrorContext)>>>, + send_instructions_to_client: SenderWithContext<ServerToClientMsg>, + receive_instructions_from_server: Arc<Mutex<mpsc::Receiver<(ServerToClientMsg, ErrorContext)>>>, + send_instructions_to_server: SenderWithContext<ClientToServerMsg>, + receive_instructions_from_client: Arc<Mutex<mpsc::Receiver<(ClientToServerMsg, ErrorContext)>>>, should_trigger_sigwinch: Arc<(Mutex<bool>, Condvar)>, sigwinch_event: Option<PositionAndSize>, } @@ -90,10 +95,10 @@ impl FakeInputOutput { let mut win_sizes = HashMap::new(); let last_snapshot_time = Arc::new(Mutex::new(Instant::now())); let stdout_writer = FakeStdoutWriter::new(last_snapshot_time.clone()); - let (client_sender, client_receiver): ChannelWithContext<ClientInstruction> = + let (client_sender, client_receiver): ChannelWithContext<ServerToClientMsg> = mpsc::channel(); let send_instructions_to_client = SenderWithContext::new(SenderType::Sender(client_sender)); - let (server_sender, server_receiver): ChannelWithContext<ServerInstruction> = + let (server_sender, server_receiver): ChannelWithContext<ClientToServerMsg> = mpsc::channel(); let send_instructions_to_server = SenderWithContext::new(SenderType::Sender(server_sender)); win_sizes.insert(0, winsize); // 0 is the current terminal @@ -126,7 +131,7 @@ impl FakeInputOutput { } self.stdin_commands = Arc::new(Mutex::new(stdin_commands)); } - pub fn add_terminal(&mut self, fd: RawFd) { + pub fn add_terminal(&self, fd: RawFd) { self.stdin_writes.lock().unwrap().insert(fd, vec![]); } pub fn add_sigwinch_event(&mut self, new_position_and_size: PositionAndSize) { @@ -153,7 +158,7 @@ impl ClientOsApi for FakeInputOutput { .unwrap() .push(IoEvent::IntoRawMode(pid)); } - fn unset_raw_mode(&mut self, pid: RawFd) { + fn unset_raw_mode(&self, pid: RawFd) { self.io_events .lock() .unwrap() @@ -195,17 +200,17 @@ impl ClientOsApi for FakeInputOutput { fn get_stdout_writer(&self) -> Box<dyn Write> { Box::new(self.stdout_writer.clone()) } - fn send_to_server(&self, msg: ServerInstruction) { + fn send_to_server(&self, msg: ClientToServerMsg) { self.send_instructions_to_server.send(msg).unwrap(); } - fn recv_from_server(&self) -> (ClientInstruction, ErrorContext) { + fn recv_from_server(&self) -> (ServerToClientMsg, ErrorContext) { self.receive_instructions_from_server .lock() .unwrap() .recv() .unwrap() } - fn receive_sigwinch(&self, cb: Box<dyn Fn()>) { + fn handle_signals(&self, sigwinch_cb: Box<dyn Fn()>, _quit_cb: Box<dyn Fn()>) { if self.sigwinch_event.is_some() { let (lock, cvar) = &*self.should_trigger_sigwinch; { @@ -214,14 +219,44 @@ impl ClientOsApi for FakeInputOutput { should_trigger_sigwinch = cvar.wait(should_trigger_sigwinch).unwrap(); } } - cb(); + sigwinch_cb(); + } + } + fn connect_to_server(&self, _path: &std::path::Path) {} + fn load_palette(&self) -> Palette { + default_palette() + } +} + +struct FakeAsyncReader { + fd: RawFd, + os_api: Box<dyn ServerOsApi>, +} + +#[async_trait] +impl AsyncReader for FakeAsyncReader { + async fn read(&mut self, buf: &mut [u8]) -> Result<usize, std::io::Error> { + // simulates async semantics: EAGAIN is not propagated to caller + loop { + let res = self.os_api.read_from_tty_stdout(self.fd, buf); + match res { + Err(nix::Error::Sys(nix::errno::Errno::EAGAIN)) => { + async_std::task::sleep(Duration::from_millis(10)).await; + continue; + } + Err(e) => { + break Err(std::io::Error::from_raw_os_error( + e.as_errno().unwrap() as i32 + )) + } + Ok(n_bytes) => break Ok(n_bytes), + } } } - fn connect_to_server(&self) {} } impl ServerOsApi for FakeInputOutput { - fn set_terminal_size_using_fd(&mut self, pid: RawFd, cols: u16, rows: u16) { + fn set_terminal_size_using_fd(&self, pid: RawFd, cols: u16, rows: u16) { let terminal_input = self .possible_tty_inputs .get(&cols) @@ -235,12 +270,15 @@ impl ServerOsApi for FakeInputOutput { .unwrap() .push(IoEvent::SetTerminalSizeUsingFd(pid, cols, rows)); } - fn spawn_terminal(&mut self, _file_to_open: Option<PathBuf>) -> (RawFd, RawFd) { + fn spawn_terminal(&self, _file_to_open: Option<PathBuf>) -> (RawFd, Pid) { let next_terminal_id = self.stdin_writes.lock().unwrap().keys().len() as RawFd + 1; self.add_terminal(next_terminal_id); - (next_terminal_id as i32, next_terminal_id + 1000) // secondary number is arbitrary here + ( + next_terminal_id as i32, + Pid::from_raw(next_terminal_id + 1000), + ) // secondary number is arbitrary here } - fn write_to_tty_stdin(&mut self, pid: RawFd, buf: &mut [u8]) -> Result<usize, nix::Error> { + fn write_to_tty_stdin(&self, pid: RawFd, buf: &[u8]) -> Result<usize, nix::Error> { let mut stdin_writes = self.stdin_writes.lock().unwrap(); let write_buffer = stdin_writes.get_mut(&pid).unwrap(); let mut bytes_written = 0; @@ -250,7 +288,7 @@ impl ServerOsApi for FakeInputOutput { } Ok(bytes_written) } - fn read_from_tty_stdout(&mut self, pid: RawFd, buf: &mut [u8]) -> Result<usize, nix::Error> { + fn read_from_tty_stdout(&self, pid: RawFd, buf: &mut [u8]) -> Result<usize, nix::Error> { let mut read_buffers = self.read_buffers.lock().unwrap(); let mut bytes_read = 0; match read_buffers.get_mut(&pid) { @@ -267,28 +305,36 @@ impl ServerOsApi for FakeInputOutput { None => Err(nix::Error::Sys(nix::errno::Errno::EAGAIN)), } } - fn tcdrain(&mut self, pid: RawFd) -> Result<(), nix::Error> { + fn async_file_reader(&self, fd: RawFd) -> Box<dyn AsyncReader> { + Box::new(FakeAsyncReader { + fd, + os_api: ServerOsApi::box_clone(self), + }) + } + fn tcdrain(&self, pid: RawFd) -> Result<(), nix::Error> { self.io_events.lock().unwrap().push(IoEvent::TcDrain(pid)); Ok(()) } fn box_clone(&self) -> Box<dyn ServerOsApi> { Box::new((*self).clone()) } - fn kill(&mut self, fd: RawFd) -> Result<(), nix::Error> { - self.io_events.lock().unwrap().push(IoEvent::Kill(fd)); + fn kill(&self, pid: Pid) -> Result<(), nix::Error> { + self.io_events.lock().unwrap().push(IoEvent::Kill(pid)); Ok(()) } - fn recv_from_client(&self) -> (ServerInstruction, ErrorContext) { + fn recv_from_client(&self) -> (ClientToServerMsg, ErrorContext) { self.receive_instructions_from_client .lock() .unwrap() .recv() .unwrap() } - fn send_to_client(&self, msg: ClientInstruction) { + fn send_to_client(&self, msg: ServerToClientMsg) { self.send_instructions_to_client.send(msg).unwrap(); } - fn add_client_sender(&mut self) {} + fn add_client_sender(&self) {} + fn remove_client_sender(&self) {} + fn send_to_temp_client(&self, _msg: ServerToClientMsg) {} fn update_receiver(&mut self, _stream: LocalSocketStream) {} fn load_palette(&self) -> Palette { default_palette() diff --git a/src/tests/integration/basic.rs b/src/tests/integration/basic.rs index 1ebcb922..640b1c55 100644 --- a/src/tests/integration/basic.rs +++ b/src/tests/integration/basic.rs @@ -1,8 +1,8 @@ -use crate::panes::PositionAndSize; use ::insta::assert_snapshot; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::commands::{ BRACKETED_PASTE_END, BRACKETED_PASTE_START, PANE_MODE, QUIT, SCROLL_DOWN_IN_SCROLL_MODE, SCROLL_MODE, SCROLL_PAGE_DOWN_IN_SCROLL_MODE, SCROLL_PAGE_UP_IN_SCROLL_MODE, @@ -10,7 +10,8 @@ use crate::tests::utils::commands::{ SPLIT_RIGHT_IN_PANE_MODE, TOGGLE_ACTIVE_TERMINAL_FULLSCREEN_IN_PANE_MODE, }; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(fake_win_size.clone()) @@ -32,7 +33,6 @@ pub fn starts_with_one_terminal() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -61,7 +61,6 @@ pub fn split_terminals_vertically() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -90,7 +89,6 @@ pub fn split_terminals_horizontally() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -126,7 +124,6 @@ pub fn split_largest_terminal() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -155,7 +152,6 @@ pub fn cannot_split_terminals_vertically_when_active_terminal_is_too_small() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -184,7 +180,6 @@ pub fn cannot_split_terminals_horizontally_when_active_terminal_is_too_small() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -213,7 +208,6 @@ pub fn cannot_split_largest_terminal_when_there_is_no_room() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -250,7 +244,6 @@ pub fn scrolling_up_inside_a_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -289,7 +282,6 @@ pub fn scrolling_down_inside_a_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -325,7 +317,6 @@ pub fn scrolling_page_up_inside_a_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -364,7 +355,6 @@ pub fn scrolling_page_down_inside_a_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -404,7 +394,6 @@ pub fn max_panes() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -442,7 +431,6 @@ pub fn toggle_focused_pane_fullscreen() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -483,7 +471,6 @@ pub fn bracketed_paste() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/close_pane.rs b/src/tests/integration/close_pane.rs index d151f63d..b5ba7f19 100644 --- a/src/tests/integration/close_pane.rs +++ b/src/tests/integration/close_pane.rs @@ -1,16 +1,17 @@ -use crate::panes::PositionAndSize; use ::insta::assert_snapshot; +use zellij_utils::pane_size::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ CLOSE_PANE_IN_PANE_MODE, ESC, MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, RESIZE_DOWN_IN_RESIZE_MODE, RESIZE_LEFT_IN_RESIZE_MODE, RESIZE_MODE, RESIZE_UP_IN_RESIZE_MODE, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(fake_win_size.clone()) @@ -45,7 +46,6 @@ pub fn close_pane_with_another_pane_above_it() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -89,7 +89,6 @@ pub fn close_pane_with_another_pane_below_it() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -130,7 +129,6 @@ pub fn close_pane_with_another_pane_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -172,7 +170,6 @@ pub fn close_pane_with_another_pane_to_the_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -219,7 +216,6 @@ pub fn close_pane_with_multiple_panes_above_it() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -264,7 +260,6 @@ pub fn close_pane_with_multiple_panes_below_it() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -311,7 +306,6 @@ pub fn close_pane_with_multiple_panes_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -356,7 +350,6 @@ pub fn close_pane_with_multiple_panes_to_the_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -423,7 +416,6 @@ pub fn close_pane_with_multiple_panes_above_it_away_from_screen_edges() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -486,7 +478,6 @@ pub fn close_pane_with_multiple_panes_below_it_away_from_screen_edges() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -551,7 +542,6 @@ pub fn close_pane_with_multiple_panes_to_the_left_away_from_screen_edges() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -616,7 +606,6 @@ pub fn close_pane_with_multiple_panes_to_the_right_away_from_screen_edges() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -654,7 +643,6 @@ pub fn closing_last_pane_exits_app() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/compatibility.rs b/src/tests/integration/compatibility.rs index b986b1de..3b28a970 100644 --- a/src/tests/integration/compatibility.rs +++ b/src/tests/integration/compatibility.rs @@ -1,14 +1,15 @@ use ::insta::assert_snapshot; use ::std::collections::HashMap; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; use crate::tests::possible_tty_inputs::Bytes; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::QUIT; +use zellij_utils::input::config::Config; /* * These tests are general compatibility tests for non-trivial scenarios running in the terminal. @@ -48,7 +49,6 @@ pub fn run_bandwhich_from_fish_shell() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -78,7 +78,6 @@ pub fn fish_tab_completion_options() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -113,7 +112,6 @@ pub fn fish_select_tab_completion_options() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -152,7 +150,6 @@ pub fn vim_scroll_region_down() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -188,7 +185,6 @@ pub fn vim_ctrl_d() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -223,7 +219,6 @@ pub fn vim_ctrl_u() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -253,7 +248,6 @@ pub fn htop() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -283,7 +277,6 @@ pub fn htop_scrolling() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -313,7 +306,6 @@ pub fn htop_right_scrolling() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -351,7 +343,6 @@ pub fn vim_overwrite() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -384,7 +375,6 @@ pub fn clear_scroll_region() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -414,7 +404,6 @@ pub fn display_tab_characters_properly() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -444,7 +433,6 @@ pub fn neovim_insert_mode() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -476,7 +464,6 @@ pub fn bash_cursor_linewrap() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -508,7 +495,6 @@ pub fn fish_paste_multiline() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -538,7 +524,6 @@ pub fn git_log() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -570,7 +555,6 @@ pub fn git_diff_scrollup() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -600,7 +584,6 @@ pub fn emacs_longbuf() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -630,7 +613,6 @@ pub fn top_and_quit() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -666,7 +648,6 @@ pub fn exa_plus_omf_theme() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/layouts.rs b/src/tests/integration/layouts.rs index bd7ceb3f..e6986924 100644 --- a/src/tests/integration/layouts.rs +++ b/src/tests/integration/layouts.rs @@ -1,12 +1,13 @@ use insta::assert_snapshot; use std::path::PathBuf; -use crate::common::input::{config::Config, options::Options}; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::commands::QUIT; use crate::tests::utils::get_output_frame_snapshots; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::input::config::Config; +use zellij_utils::pane_size::PositionAndSize; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(fake_win_size.clone()) @@ -24,7 +25,7 @@ pub fn accepts_basic_layout() { let mut fake_input_output = get_fake_os_input(&fake_win_size); fake_input_output.add_terminal_input(&[&QUIT]); let mut opts = CliArgs::default(); - opts.layout = Some(PathBuf::from( + opts.layout_path = Some(PathBuf::from( "src/tests/fixtures/layouts/three-panes-with-nesting.yaml", )); @@ -33,7 +34,6 @@ pub fn accepts_basic_layout() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/move_focus_down.rs b/src/tests/integration/move_focus_down.rs index e182acf9..2f18ab62 100644 --- a/src/tests/integration/move_focus_down.rs +++ b/src/tests/integration/move_focus_down.rs @@ -1,15 +1,16 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_DOWN_IN_PANE_MODE, MOVE_FOCUS_UP_IN_PANE_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -37,7 +38,6 @@ pub fn move_focus_down() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -75,7 +75,6 @@ pub fn move_focus_down_to_the_most_recently_used_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_left.rs b/src/tests/integration/move_focus_left.rs index c991d1e8..a9fca49e 100644 --- a/src/tests/integration/move_focus_left.rs +++ b/src/tests/integration/move_focus_left.rs @@ -1,16 +1,17 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ ENTER, MOVE_FOCUS_LEFT_IN_NORMAL_MODE, MOVE_FOCUS_LEFT_IN_PANE_MODE, MOVE_FOCUS_RIGHT_IN_PANE_MODE, NEW_TAB_IN_TAB_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, TAB_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -37,7 +38,6 @@ pub fn move_focus_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -76,7 +76,6 @@ pub fn move_focus_left_to_the_most_recently_used_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -115,7 +114,6 @@ pub fn move_focus_left_changes_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_right.rs b/src/tests/integration/move_focus_right.rs index ffc8cacf..c85d5b96 100644 --- a/src/tests/integration/move_focus_right.rs +++ b/src/tests/integration/move_focus_right.rs @@ -1,16 +1,17 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ ENTER, MOVE_FOCUS_LEFT_IN_PANE_MODE, MOVE_FOCUS_RIGHT_IN_NORMAL_MODE, MOVE_FOCUS_RIGHT_IN_PANE_MODE, NEW_TAB_IN_TAB_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, TAB_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -38,7 +39,6 @@ pub fn move_focus_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -76,7 +76,6 @@ pub fn move_focus_right_to_the_most_recently_used_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -115,7 +114,6 @@ pub fn move_focus_right_changes_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/move_focus_up.rs b/src/tests/integration/move_focus_up.rs index 54bfef5e..d161ff8a 100644 --- a/src/tests/integration/move_focus_up.rs +++ b/src/tests/integration/move_focus_up.rs @@ -1,15 +1,16 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_DOWN_IN_PANE_MODE, MOVE_FOCUS_UP_IN_PANE_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -36,7 +37,6 @@ pub fn move_focus_up() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -75,7 +75,6 @@ pub fn move_focus_up_to_the_most_recently_used_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_down.rs b/src/tests/integration/resize_down.rs index 0e710b4e..4ef45a06 100644 --- a/src/tests/integration/resize_down.rs +++ b/src/tests/integration/resize_down.rs @@ -1,16 +1,17 @@ use insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, RESIZE_DOWN_IN_RESIZE_MODE, RESIZE_LEFT_IN_RESIZE_MODE, RESIZE_MODE, SLEEP, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -48,7 +49,6 @@ pub fn resize_down_with_pane_above() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -94,7 +94,6 @@ pub fn resize_down_with_pane_below() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -146,7 +145,6 @@ pub fn resize_down_with_panes_above_and_below() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -197,7 +195,6 @@ pub fn resize_down_with_multiple_panes_above() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -250,7 +247,6 @@ pub fn resize_down_with_panes_above_aligned_left_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -302,7 +298,6 @@ pub fn resize_down_with_panes_below_aligned_left_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -352,7 +347,6 @@ pub fn resize_down_with_panes_above_aligned_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -403,7 +397,6 @@ pub fn resize_down_with_panes_below_aligned_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -457,7 +450,6 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -513,7 +505,6 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -586,7 +577,6 @@ pub fn resize_down_with_panes_above_aligned_left_and_right_with_panes_to_the_lef CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -661,7 +651,6 @@ pub fn resize_down_with_panes_below_aligned_left_and_right_with_to_the_left_and_ CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -704,7 +693,6 @@ pub fn cannot_resize_down_when_pane_below_is_at_minimum_height() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_left.rs b/src/tests/integration/resize_left.rs index 5d498e96..1b820501 100644 --- a/src/tests/integration/resize_left.rs +++ b/src/tests/integration/resize_left.rs @@ -1,15 +1,16 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, RESIZE_LEFT_IN_RESIZE_MODE, RESIZE_MODE, RESIZE_UP_IN_RESIZE_MODE, SLEEP, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -44,7 +45,6 @@ pub fn resize_left_with_pane_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -88,7 +88,6 @@ pub fn resize_left_with_pane_to_the_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -134,7 +133,6 @@ pub fn resize_left_with_panes_to_the_left_and_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -183,7 +181,6 @@ pub fn resize_left_with_multiple_panes_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -234,7 +231,6 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -282,7 +278,6 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -332,7 +327,6 @@ pub fn resize_left_with_panes_to_the_left_aligned_bottom_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -381,7 +375,6 @@ pub fn resize_left_with_panes_to_the_right_aligned_bottom_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -435,7 +428,6 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_current_pa CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -491,7 +483,6 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_current_p CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -564,7 +555,6 @@ pub fn resize_left_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abov CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -640,7 +630,6 @@ pub fn resize_left_with_panes_to_the_right_aligned_top_and_bottom_with_panes_abo CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -683,7 +672,6 @@ pub fn cannot_resize_left_when_pane_to_the_left_is_at_minimum_width() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_right.rs b/src/tests/integration/resize_right.rs index 8be15315..44601f2c 100644 --- a/src/tests/integration/resize_right.rs +++ b/src/tests/integration/resize_right.rs @@ -1,15 +1,16 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, RESIZE_MODE, RESIZE_RIGHT_IN_RESIZE_MODE, RESIZE_UP_IN_RESIZE_MODE, SLEEP, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -44,7 +45,6 @@ pub fn resize_right_with_pane_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -88,7 +88,6 @@ pub fn resize_right_with_pane_to_the_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -134,7 +133,6 @@ pub fn resize_right_with_panes_to_the_left_and_right() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -183,7 +181,6 @@ pub fn resize_right_with_multiple_panes_to_the_left() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -234,7 +231,6 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -282,7 +278,6 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -332,7 +327,6 @@ pub fn resize_right_with_panes_to_the_left_aligned_bottom_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -381,7 +375,6 @@ pub fn resize_right_with_panes_to_the_right_aligned_bottom_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -435,7 +428,6 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_current_p CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -491,7 +483,6 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_current_ CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -564,7 +555,6 @@ pub fn resize_right_with_panes_to_the_left_aligned_top_and_bottom_with_panes_abo CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -639,7 +629,6 @@ pub fn resize_right_with_panes_to_the_right_aligned_top_and_bottom_with_panes_ab CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -682,7 +671,6 @@ pub fn cannot_resize_right_when_pane_to_the_left_is_at_minimum_width() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/resize_up.rs b/src/tests/integration/resize_up.rs index ba810a9f..9aca8d5a 100644 --- a/src/tests/integration/resize_up.rs +++ b/src/tests/integration/resize_up.rs @@ -1,15 +1,16 @@ use ::insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, RESIZE_LEFT_IN_RESIZE_MODE, RESIZE_MODE, RESIZE_UP_IN_RESIZE_MODE, SLEEP, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -46,7 +47,6 @@ pub fn resize_up_with_pane_above() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -92,7 +92,6 @@ pub fn resize_up_with_pane_below() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -143,7 +142,6 @@ pub fn resize_up_with_panes_above_and_below() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -193,7 +191,6 @@ pub fn resize_up_with_multiple_panes_above() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -244,7 +241,6 @@ pub fn resize_up_with_panes_above_aligned_left_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -296,7 +292,6 @@ pub fn resize_up_with_panes_below_aligned_left_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -346,7 +341,6 @@ pub fn resize_up_with_panes_above_aligned_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -397,7 +391,6 @@ pub fn resize_up_with_panes_below_aligned_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -451,7 +444,6 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -507,7 +499,6 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_current_pane() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -580,7 +571,6 @@ pub fn resize_up_with_panes_above_aligned_left_and_right_with_panes_to_the_left_ CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -655,7 +645,6 @@ pub fn resize_up_with_panes_below_aligned_left_and_right_with_to_the_left_and_ri CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -698,7 +687,6 @@ pub fn cannot_resize_up_when_pane_above_is_at_minimum_height() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/tabs.rs b/src/tests/integration/tabs.rs index 1d8a2c9d..90f82c6d 100644 --- a/src/tests/integration/tabs.rs +++ b/src/tests/integration/tabs.rs @@ -1,16 +1,18 @@ use insta::assert_snapshot; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; +use crate::tests::utils::commands::CLOSE_PANE_IN_PANE_MODE; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{panes::PositionAndSize, tests::utils::commands::CLOSE_PANE_IN_PANE_MODE}; -use crate::{start, CliArgs}; +use crate::CliArgs; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ CLOSE_TAB_IN_TAB_MODE, NEW_TAB_IN_TAB_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SWITCH_NEXT_TAB_IN_TAB_MODE, SWITCH_PREV_TAB_IN_TAB_MODE, TAB_MODE, TOGGLE_ACTIVE_TERMINAL_FULLSCREEN_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; +use zellij_utils::pane_size::PositionAndSize; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -38,7 +40,6 @@ pub fn open_new_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -75,7 +76,6 @@ pub fn switch_to_prev_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -112,7 +112,6 @@ pub fn switch_to_next_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -149,7 +148,6 @@ pub fn close_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -187,7 +185,6 @@ pub fn close_last_pane_in_a_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -227,7 +224,6 @@ pub fn close_the_middle_tab() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -272,7 +268,6 @@ pub fn close_the_tab_that_has_a_pane_in_fullscreen() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -309,7 +304,6 @@ pub fn closing_last_tab_exits_the_app() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/integration/terminal_window_resize.rs b/src/tests/integration/terminal_window_resize.rs index 7c06609a..2be41c3a 100644 --- a/src/tests/integration/terminal_window_resize.rs +++ b/src/tests/integration/terminal_window_resize.rs @@ -1,11 +1,12 @@ -use crate::panes::PositionAndSize; use ::insta::assert_snapshot; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::commands::QUIT; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(fake_win_size.clone()) @@ -35,7 +36,6 @@ pub fn window_width_decrease_with_one_pane() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -72,7 +72,6 @@ pub fn window_width_increase_with_one_pane() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -109,7 +108,6 @@ pub fn window_height_increase_with_one_pane() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer @@ -146,7 +144,6 @@ pub fn window_width_and_height_decrease_with_one_pane() { opts, Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output .stdout_writer diff --git a/src/tests/integration/toggle_fullscreen.rs b/src/tests/integration/toggle_fullscreen.rs index 8a63bbea..80257982 100644 --- a/src/tests/integration/toggle_fullscreen.rs +++ b/src/tests/integration/toggle_fullscreen.rs @@ -1,15 +1,16 @@ use insta::assert_snapshot; -use crate::panes::PositionAndSize; use crate::tests::fakes::FakeInputOutput; +use crate::tests::start; use crate::tests::utils::{get_next_to_last_snapshot, get_output_frame_snapshots}; -use crate::{start, CliArgs}; +use crate::CliArgs; +use zellij_utils::pane_size::PositionAndSize; -use crate::common::input::{config::Config, options::Options}; use crate::tests::utils::commands::{ MOVE_FOCUS_IN_PANE_MODE, PANE_MODE, QUIT, SPLIT_DOWN_IN_PANE_MODE, SPLIT_RIGHT_IN_PANE_MODE, TOGGLE_ACTIVE_TERMINAL_FULLSCREEN_IN_PANE_MODE, }; +use zellij_utils::input::config::Config; fn get_fake_os_input(fake_win_size: &PositionAndSize) -> FakeInputOutput { FakeInputOutput::new(*fake_win_size) @@ -37,7 +38,6 @@ pub fn adding_new_terminal_in_fullscreen() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output @@ -73,7 +73,6 @@ pub fn move_focus_is_disabled_in_fullscreen() { CliArgs::default(), Box::new(fake_input_output.clone()), Config::default(), - Options::default(), ); let output_frames = fake_input_output diff --git a/src/tests/mod.rs b/src/tests/mod.rs index 6e07c96d..e075ed49 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -3,3 +3,24 @@ pub mod integration; pub mod possible_tty_inputs; pub mod tty_inputs; pub mod utils; + +use std::path::PathBuf; +use zellij_client::{os_input_output::ClientOsApi, start_client, ClientInfo}; +use zellij_server::{os_input_output::ServerOsApi, start_server}; +use zellij_utils::{cli::CliArgs, input::config::Config}; + +pub fn start( + client_os_input: Box<dyn ClientOsApi>, + opts: CliArgs, + server_os_input: Box<dyn ServerOsApi>, + config: Config, +) { + let server_thread = std::thread::Builder::new() + .name("server_thread".into()) + .spawn(move || { + start_server(server_os_input, PathBuf::from("")); + }) + .unwrap(); + start_client(client_os_input, opts, config, ClientInfo::New("".into())); + let _ = server_thread.join(); +} diff --git a/src/tests/utils.rs b/src/tests/utils.rs index f01c1ac5..6267c883 100644 --- a/src/tests/utils.rs +++ b/src/tests/utils.rs @@ -1,5 +1,8 @@ -use crate::panes::PositionAndSize; -use crate::panes::TerminalPane; +use zellij_utils::{vte, zellij_tile}; + +use zellij_server::{panes::TerminalPane, tab::Pane}; +use zellij_tile::data::Palette; +use zellij_utils::pane_size::PositionAndSize; pub fn get_output_frame_snapshots( output_frames: &[Vec<u8>], @@ -7,7 +10,7 @@ pub fn get_output_frame_snapshots( ) -> Vec<String> { let mut vte_parser = vte::Parser::new(); let main_pid = 0; - let mut terminal_output = TerminalPane::new(main_pid, *win_size); + let mut terminal_output = TerminalPane::new(main_pid, *win_size, Palette::default()); let mut snapshots = vec![]; for frame in output_frames.iter() { |
