diff options
author | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-10-08 00:54:40 +0800 |
---|---|---|
committer | cyqsimon <28627918+cyqsimon@users.noreply.github.com> | 2023-10-08 00:54:40 +0800 |
commit | 471aa62a95c28963f9a7fa18405b2105f1ab7163 (patch) | |
tree | accffbd068608341e233a893b4a391c39390893e | |
parent | 47158ac3c777c27eab7d38406554b8ccfa09e587 (diff) |
Migrate all tests to using `cargo-insta`
36 files changed, 469 insertions, 179 deletions
diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__basic_startup-2.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__basic_startup-2.snap new file mode 100644 index 0000000..2b05d3e --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__basic_startup-2.snap @@ -0,0 +1,12 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__bi_directional_traffic-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__bi_directional_traffic-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__bi_directional_traffic-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-0.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-draw_events-0.snap index 1e26e22..1e26e22 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-0.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-draw_events-0.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-1.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-draw_events-1.snap index 9c60b32..9c60b32 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-1.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-draw_events-1.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-events.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-events.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__full-width-under-30-height-events.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_connections_from_remote_address-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_connections_from_remote_address-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_connections_from_remote_address-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_different_connections-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_different_connections-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_different_connections-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_single_connection-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_single_connection-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_packets_of_traffic_from_single_connection-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_processes_with_multiple_connections-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_processes_with_multiple_connections-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__multiple_processes_with_multiple_connections-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__no_resolve_mode-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__no_resolve_mode-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__no_resolve_mode-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_packet_of_traffic-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_packet_of_traffic-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_packet_of_traffic-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_process_with_multiple_connections-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_process_with_multiple_connections-3.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__one_process_with_multiple_connections-3.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__pause_by_space-4.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__pause_by_space-4.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__pause_by_space-4.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__rearranged_by_tab-6.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__rearranged_by_tab-6.snap new file mode 100644 index 0000000..7481b09 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__rearranged_by_tab-6.snap @@ -0,0 +1,24 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional_total-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional_total-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_bi_directional_total-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_total-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_total-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_multiple_processes_total-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process_total-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process_total-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__sustained_traffic_from_one_process_total-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_host_names-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_host_names-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_host_names-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_winch_event-4.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_winch_event-4.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__traffic_with_winch_event-4.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__truncate_long_hostnames-3.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__truncate_long_hostnames-3.snap new file mode 100644 index 0000000..ea1dad1 --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__truncate_long_hostnames-3.snap @@ -0,0 +1,18 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-0.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-draw_events-0.snap index 53043a7..53043a7 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-0.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-draw_events-0.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-1.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-draw_events-1.snap index 8230e66..8230e66 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-1.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-draw_events-1.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-events.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-events.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-full-height-events.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-0.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-draw_events-0.snap index 0bbc796..0bbc796 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-0.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-draw_events-0.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-1.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-draw_events-1.snap index 06cb645..06cb645 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-1.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-draw_events-1.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-events.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-events.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-120-width-under-30-height-events.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-0.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-draw_events-0.snap index b0c7143..b0c7143 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-0.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-draw_events-0.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-1.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-draw_events-1.snap index 8e7dbcb..8e7dbcb 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-1.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-draw_events-1.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-events.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-events.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-50-width-under-50-height-events.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-0.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-draw_events-0.snap index 281674a..281674a 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-0.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-draw_events-0.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-1.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-draw_events-1.snap index 6f24434..6f24434 100644 --- a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-1.snap +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-draw_events-1.snap diff --git a/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-events.snap b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-events.snap new file mode 100644 index 0000000..723b4bc --- /dev/null +++ b/src/tests/cases/snapshots/bandwhich__tests__cases__ui__under-70-width-under-30-height-events.snap @@ -0,0 +1,15 @@ +--- +source: src/tests/cases/ui.rs +expression: terminal_events.lock().unwrap().as_slice() +--- +[ + Clear, + HideCursor, + Draw, + HideCursor, + Flush, + Draw, + HideCursor, + Flush, + ShowCursor, +] diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs index 32ac87b..bf00da5 100644 --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -1,7 +1,7 @@ use std::{collections::HashMap, iter, net::IpAddr}; use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers}; -use insta::assert_snapshot; +use insta::{assert_debug_snapshot, assert_snapshot}; use pnet::datalink::DataLinkReceiver; use rstest::rstest; @@ -15,8 +15,7 @@ use crate::{ sleep_and_quit_events, sleep_resize_and_quit_events, test_backend_factory, }, fakes::{ - create_fake_dns_client, get_interfaces, get_open_sockets, NetworkFrames, - TerminalEvent::*, TerminalEvents, + create_fake_dns_client, get_interfaces, get_open_sockets, NetworkFrames, TerminalEvents, }, }, Opt, OsInputOutput, RenderOpts, @@ -34,14 +33,10 @@ fn basic_startup() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![Clear, HideCursor, Draw, HideCursor, Flush, ShowCursor]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 1); assert_snapshot!(&terminal_draw_events_mirror[0]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -89,18 +84,13 @@ fn pause_by_space() { let opts = opts_ui(); start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); + assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -145,20 +135,15 @@ fn rearranged_by_tab() { let opts = opts_ui(); start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); + assert_eq!(terminal_draw_events_mirror.len(), 5); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); assert_snapshot!(&terminal_draw_events_mirror[3]); assert_snapshot!(&terminal_draw_events_mirror[4]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -410,17 +395,11 @@ fn one_packet_of_traffic() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_short as frames)] @@ -431,17 +410,11 @@ fn bi_directional_traffic(frames: Vec<Box<dyn DataLinkReceiver>>) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -469,17 +442,11 @@ fn multiple_packets_of_traffic_from_different_connections() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -507,17 +474,11 @@ fn multiple_packets_of_traffic_from_single_connection() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -545,17 +506,11 @@ fn one_process_with_multiple_connections() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -597,17 +552,11 @@ fn multiple_processes_with_multiple_connections() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -635,17 +584,11 @@ fn multiple_connections_from_remote_address() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 2); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_one_process as frames)] @@ -657,18 +600,11 @@ fn sustained_traffic_from_one_process(frames: Vec<Box<dyn DataLinkReceiver>>) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_one_process as frames)] @@ -681,18 +617,11 @@ fn sustained_traffic_from_one_process_total(frames: Vec<Box<dyn DataLinkReceiver start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2].replace("1 \n", "2 \n")); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_multiple_processes as frames)] @@ -704,18 +633,11 @@ fn sustained_traffic_from_multiple_processes(frames: Vec<Box<dyn DataLinkReceive start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_multiple_processes as frames)] @@ -728,18 +650,11 @@ fn sustained_traffic_from_multiple_processes_total(frames: Vec<Box<dyn DataLinkR start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2].replace("1 \n", "2 \n")); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_long as frames)] @@ -753,18 +668,11 @@ fn sustained_traffic_from_multiple_processes_bi_directional( start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_long as frames)] @@ -779,18 +687,11 @@ fn sustained_traffic_from_multiple_processes_bi_directional_total( start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2].replace("1 \n", "2 \n")); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_long as network_frames)] @@ -825,18 +726,11 @@ fn traffic_with_host_names(network_frames: Vec<Box<dyn DataLinkReceiver>>) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_long as network_frames)] @@ -871,18 +765,11 @@ fn truncate_long_hostnames(network_frames: Vec<Box<dyn DataLinkReceiver>>) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest(sample_frames_sustained_long as network_frames)] @@ -917,18 +804,11 @@ fn no_resolve_mode(network_frames: Vec<Box<dyn DataLinkReceiver>>) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[test] @@ -958,19 +838,12 @@ fn traffic_with_winch_event() { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, Draw, HideCursor, - Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] - ); - assert_eq!(terminal_draw_events_mirror.len(), 3); assert_snapshot!(&terminal_draw_events_mirror[0]); assert_snapshot!(&terminal_draw_events_mirror[1]); assert_snapshot!(&terminal_draw_events_mirror[2]); + + assert_debug_snapshot!(terminal_events.lock().unwrap().as_slice()); } #[rstest] @@ -1018,15 +891,18 @@ fn layout(#[case] name: &str, #[case] width: u16, #[case] height: u16) { start(backend, os_input, opts); let terminal_draw_events_mirror = terminal_draw_events.lock().unwrap(); - let expected_terminal_events = vec![ - Clear, HideCursor, Draw, HideCursor, Flush, Draw, HideCursor, Flush, ShowCursor, - ]; - assert_eq!( - &terminal_events.lock().unwrap()[..], - &expected_terminal_events[..] + assert_debug_snapshot!( + format!("{name}-events"), + terminal_events.lock().unwrap().as_slice() ); assert_eq!(terminal_draw_events_mirror.len(), 2); - assert_snapshot!(format!("{name}-0"), &terminal_draw_events_mirror[0]); - assert_snapshot!(format!("{name}-1"), &terminal_draw_events_mirror[1]); + assert_snapshot!( + format!("{name}-draw_events-0"), + &terminal_draw_events_mirror[0] + ); + assert_snapshot!( + format!("{name}-draw_events-1"), + &terminal_draw_events_mirror[1] + ); } |