From 9737ba98c01f3198e916c54f437801e12cce440d Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Mon, 6 Jan 2020 17:57:23 -0500 Subject: Update snapshots because new process identification logic changes output --- src/tests/cases/raw_mode.rs | 46 ++++++------- ...__multiple_connections_from_remote_address.snap | 5 +- ...kets_of_traffic_from_different_connections.snap | 7 +- ...ltiple_processes_with_multiple_connections.snap | 6 +- .../cases/snapshots/raw_mode__no_resolve_mode.snap | 4 +- ...ode__one_process_with_multiple_connections.snap | 8 +-- ..._sustained_traffic_from_multiple_processes.snap | 4 +- ...fic_from_multiple_processes_bi_directional.snap | 4 +- .../raw_mode__traffic_with_host_names.snap | 4 +- .../ui__layout_full_width_under_30_height-2.snap | 6 +- .../ui__layout_under_120_width_full_height-2.snap | 6 +- .../ui__layout_under_150_width_full_height-2.snap | 6 +- ...__layout_under_150_width_under_30_height-2.snap | 6 +- ...multiple_connections_from_remote_address-2.snap | 4 +- ...ts_of_traffic_from_different_connections-2.snap | 8 +-- ...iple_processes_with_multiple_connections-2.snap | 6 +- .../cases/snapshots/ui__no_resolve_mode-2.snap | 4 +- src/tests/cases/snapshots/ui__no_resolve_mode.snap | 2 +- ...i__one_process_with_multiple_connections-2.snap | 8 +-- ..._sustained_traffic_from_multiple_processes.snap | 2 +- ...c_from_multiple_processes_bi_directional-2.snap | 4 +- ...fic_from_multiple_processes_bi_directional.snap | 2 +- .../snapshots/ui__traffic_with_host_names-2.snap | 4 +- .../snapshots/ui__traffic_with_host_names.snap | 2 +- src/tests/cases/ui.rs | 76 +++++++++++----------- src/tests/fakes/fake_input.rs | 8 +-- 26 files changed, 119 insertions(+), 123 deletions(-) diff --git a/src/tests/cases/raw_mode.rs b/src/tests/cases/raw_mode.rs index b2d6d64..d378233 100644 --- a/src/tests/cases/raw_mode.rs +++ b/src/tests/cases/raw_mode.rs @@ -95,17 +95,17 @@ fn bi_directional_traffic() { fn multiple_packets_of_traffic_from_different_connections() { let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( - "1.1.1.1", + "2.2.2.2", "10.0.0.2", 12345, 443, - b"I have come from 1.1.1.1", + b"I have come from 2.2.2.2", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"I come from 2.2.2.2", )), ]) as Box]; @@ -158,11 +158,11 @@ fn one_process_with_multiple_connections() { b"I have come from 1.1.1.1", )), Some(build_tcp_packet( - "3.3.3.3", + "1.1.1.1", "10.0.0.2", - 1337, + 12346, 443, - b"Funny that, I'm from 3.3.3.3", + b"Funny that, I'm from 1.1.1.1", )), ]) as Box]; let (_, _, backend) = test_backend_factory(190, 50); @@ -189,21 +189,21 @@ fn multiple_processes_with_multiple_connections() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really nice!", )), Some(build_tcp_packet( "4.4.4.4", "10.0.0.2", 1337, - 443, + 4432, b"I'm partial to 4.4.4.4", )), ]) as Box]; @@ -290,7 +290,7 @@ fn sustained_traffic_from_multiple_processes() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I come from 3.3.3.3", )), None, // sleep @@ -305,7 +305,7 @@ fn sustained_traffic_from_multiple_processes() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I come 3.3.3.3 one second later", )), ]) as Box]; @@ -326,7 +326,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -334,7 +334,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -355,7 +355,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -363,7 +363,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( @@ -398,7 +398,7 @@ fn traffic_with_host_names() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -406,7 +406,7 @@ fn traffic_with_host_names() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -427,7 +427,7 @@ fn traffic_with_host_names() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -435,7 +435,7 @@ fn traffic_with_host_names() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( @@ -483,7 +483,7 @@ fn no_resolve_mode() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -491,7 +491,7 @@ fn no_resolve_mode() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -512,7 +512,7 @@ fn no_resolve_mode() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -520,7 +520,7 @@ fn no_resolve_mode() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( diff --git a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap index 2542165..bb165d1 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_connections_from_remote_address.snap @@ -2,9 +2,8 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -process: "3" up/down Bps: 0/51 connections: 1 +process: "1" up/down Bps: 0/95 connections: 2 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "3" +connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/51 process: "1" remote_address: 1.1.1.1 up/down Bps: 0/95 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap index b897a0a..ce51ab2 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_packets_of_traffic_from_different_connections.snap @@ -4,8 +4,7 @@ expression: formatted --- process: "1" up/down Bps: 0/44 connections: 1 process: "4" up/down Bps: 0/39 connections: 1 -connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" -remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 -remote_address: 2.2.2.2 up/down Bps: 0/39 connections: 1 +connection: :443 => 2.2.2.2:12345 (tcp) up/down Bps: 0/44 process: "1" +connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/39 process: "4" +remote_address: 2.2.2.2 up/down Bps: 0/83 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap index 15476f0..e359b8c 100644 --- a/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__multiple_processes_with_multiple_connections.snap @@ -7,9 +7,9 @@ process: "2" up/down Bps: 0/42 connections: 1 process: "4" up/down Bps: 0/53 connections: 1 process: "5" up/down Bps: 0/45 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" -connection: :443 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" +connection: :4434 => 2.2.2.2:54321 (tcp) up/down Bps: 0/53 process: "4" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/45 process: "5" +connection: :4432 => 4.4.4.4:1337 (tcp) up/down Bps: 0/42 process: "2" remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: 2.2.2.2 up/down Bps: 0/53 connections: 1 remote_address: 3.3.3.3 up/down Bps: 0/45 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap index 87ca819..90291e9 100644 --- a/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/raw_mode__no_resolve_mode.snap @@ -5,13 +5,13 @@ expression: formatted process: "1" up/down Bps: 57/61 connections: 1 process: "5" up/down Bps: 34/37 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: 3.3.3.3 up/down Bps: 34/37 connections: 1 process: "1" up/down Bps: 37/36 connections: 1 process: "5" up/down Bps: 32/46 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap index 1e9cfba..a6087fe 100644 --- a/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap +++ b/src/tests/cases/snapshots/raw_mode__one_process_with_multiple_connections.snap @@ -2,10 +2,8 @@ source: src/tests/cases/raw_mode.rs expression: formatted --- -process: "1" up/down Bps: 0/44 connections: 1 -process: "5" up/down Bps: 0/48 connections: 1 +process: "1" up/down Bps: 0/92 connections: 2 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/48 process: "5" -remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 -remote_address: 3.3.3.3 up/down Bps: 0/48 connections: 1 +connection: :443 => 1.1.1.1:12346 (tcp) up/down Bps: 0/48 process: "1" +remote_address: 1.1.1.1 up/down Bps: 0/92 connections: 2 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap index 6b5dfdf..488e50a 100644 --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes.snap @@ -5,13 +5,13 @@ expression: formatted process: "1" up/down Bps: 0/44 connections: 1 process: "5" up/down Bps: 0/39 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/44 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/39 process: "5" remote_address: 1.1.1.1 up/down Bps: 0/44 connections: 1 remote_address: 3.3.3.3 up/down Bps: 0/39 connections: 1 process: "1" up/down Bps: 0/61 connections: 1 process: "5" up/down Bps: 0/51 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 0/61 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 0/51 process: "5" remote_address: 1.1.1.1 up/down Bps: 0/61 connections: 1 remote_address: 3.3.3.3 up/down Bps: 0/51 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap index 87ca819..90291e9 100644 --- a/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/raw_mode__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -5,13 +5,13 @@ expression: formatted process: "1" up/down Bps: 57/61 connections: 1 process: "5" up/down Bps: 34/37 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: 1.1.1.1 up/down Bps: 57/61 connections: 1 remote_address: 3.3.3.3 up/down Bps: 34/37 connections: 1 process: "1" up/down Bps: 37/36 connections: 1 process: "5" up/down Bps: 32/46 connections: 1 connection: :443 => 1.1.1.1:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :443 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: :4435 => 3.3.3.3:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: 1.1.1.1 up/down Bps: 37/36 connections: 1 remote_address: 3.3.3.3 up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap index b6c4b85..80b85a7 100644 --- a/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/raw_mode__traffic_with_host_names.snap @@ -5,13 +5,13 @@ expression: formatted process: "1" up/down Bps: 57/61 connections: 1 process: "5" up/down Bps: 34/37 connections: 1 connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 57/61 process: "1" -connection: :443 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" +connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 34/37 process: "5" remote_address: one.one.one.one up/down Bps: 57/61 connections: 1 remote_address: three.three.three.three up/down Bps: 34/37 connections: 1 process: "1" up/down Bps: 37/36 connections: 1 process: "5" up/down Bps: 32/46 connections: 1 connection: :443 => one.one.one.one:12345 (tcp) up/down Bps: 37/36 process: "1" -connection: :443 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" +connection: :4435 => three.three.three.three:1337 (tcp) up/down Bps: 32/46 process: "5" remote_address: one.one.one.one up/down Bps: 37/36 connections: 1 remote_address: three.three.three.three up/down Bps: 32/46 connections: 1 diff --git a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap index 32e4987..d8e8259 100644 --- a/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_full_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - 5 1 0Bps / 45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps + 4 1 0Bps / 53Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps + 5 1 0Bps / 45Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 2 1 0Bps / 42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + 2 1 0Bps / 42Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap index fb71517..89a8a2c 100644 --- a/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_120_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - :443 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps + :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps + :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - :443 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap index 6c9ebb1..245c990 100644 --- a/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_full_height-2.snap @@ -30,10 +30,10 @@ expression: "&terminal_draw_events_mirror[1]" - :443 => 2.2.2.2:54321 (t 0Bps / 53Bps 2.2.2.2 0Bps / 53Bps - :443 => 3.3.3.3:1337 (tc 0Bps / 45Bps 3.3.3.3 0Bps / 45Bps + :4434 => 2.2.2.2:54321 ( 0Bps / 53Bps 2.2.2.2 0Bps / 53Bps + :4435 => 3.3.3.3:1337 (t 0Bps / 45Bps 3.3.3.3 0Bps / 45Bps :443 => 1.1.1.1:12345 (t 0Bps / 44Bps 1.1.1.1 0Bps / 44Bps - :443 => 4.4.4.4:1337 (tc 0Bps / 42Bps 4.4.4.4 0Bps / 42Bps + :4432 => 4.4.4.4:1337 (t 0Bps / 42Bps 4.4.4.4 0Bps / 42Bps diff --git a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap index 73a8898..3bb6f50 100644 --- a/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap +++ b/src/tests/cases/snapshots/ui__layout_under_150_width_under_30_height-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 0Bps / 53Bps :443 => 2.2.2.2:54321 (t 0Bps / 53Bps - 5 0Bps / 45Bps :443 => 3.3.3.3:1337 (tc 0Bps / 45Bps + 4 0Bps / 53Bps :4434 => 2.2.2.2:54321 ( 0Bps / 53Bps + 5 0Bps / 45Bps :4435 => 3.3.3.3:1337 (t 0Bps / 45Bps 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (t 0Bps / 44Bps - 2 0Bps / 42Bps :443 => 4.4.4.4:1337 (tc 0Bps / 42Bps + 2 0Bps / 42Bps :4432 => 4.4.4.4:1337 (t 0Bps / 42Bps diff --git a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap index eb863b8..392c313 100644 --- a/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_connections_from_remote_address-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 3 1 0Bps / 51Bps :443 => 1.1.1.1:12346 (tcp) 3 0Bps / 51Bps - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps + 1 2 0Bps / 95Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 51Bps + :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps diff --git a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap index 681e499..e2d5cd7 100644 --- a/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_packets_of_traffic_from_different_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 4 1 0Bps / 39Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps / 39Bps + 1 1 0Bps / 44Bps :443 => 2.2.2.2:12345 (tcp) 1 0Bps / 44Bps + 4 1 0Bps / 39Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 39Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - 1.1.1.1 1 0Bps / 44Bps - 2.2.2.2 1 0Bps / 39Bps + 2.2.2.2 2 0Bps / 83Bps + diff --git a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap index daadf3c..3ff049f 100644 --- a/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__multiple_processes_with_multiple_connections-2.snap @@ -6,10 +6,10 @@ expression: "&terminal_draw_events_mirror[1]" - 4 1 0Bps / 53Bps :443 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps - 5 1 0Bps / 45Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps + 4 1 0Bps / 53Bps :4434 => 2.2.2.2:54321 (tcp) 4 0Bps / 53Bps + 5 1 0Bps / 45Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 45Bps 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 2 1 0Bps / 42Bps :443 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps + 2 1 0Bps / 42Bps :4432 => 4.4.4.4:1337 (tcp) 2 0Bps / 42Bps diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap index 42e4e17..857fa24 100644 --- a/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 5 => 3.3.3.3:1 37 5 32 46 + 1 7 6 => 1.1.1.1:12 45 1 7 6 diff --git a/src/tests/cases/snapshots/ui__no_resolve_mode.snap b/src/tests/cases/snapshots/ui__no_resolve_mode.snap index 7b0d9ba..908ae2e 100644 --- a/src/tests/cases/snapshots/ui__no_resolve_mode.snap +++ b/src/tests/cases/snapshots/ui__no_resolve_mode.snap @@ -7,7 +7,7 @@ expression: "&terminal_draw_events_mirror[1]" 1 1 57Bps / 61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps + 5 1 34Bps / 37Bps :4435 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps diff --git a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap index ffcbac0..95bb606 100644 --- a/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap +++ b/src/tests/cases/snapshots/ui__one_process_with_multiple_connections-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[1]" - 5 1 0Bps / 48Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps / 48Bps - 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps + 1 2 0Bps / 92Bps :443 => 1.1.1.1:12346 (tcp) 1 0Bps / 48Bps + :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps @@ -30,8 +30,8 @@ expression: "&terminal_draw_events_mirror[1]" - 3.3.3.3 1 0Bps / 48Bps - 1.1.1.1 1 0Bps / 44Bps + 1.1.1.1 2 0Bps / 92Bps + diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap index 3af52d5..a7b7f32 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes.snap @@ -7,7 +7,7 @@ expression: "&terminal_draw_events_mirror[1]" 1 1 0Bps / 44Bps :443 => 1.1.1.1:12345 (tcp) 1 0Bps / 44Bps - 5 1 0Bps / 39Bps :443 => 3.3.3.3:1337 (tcp) 5 0Bps / 39Bps + 5 1 0Bps / 39Bps :4435 => 3.3.3.3:1337 (tcp) 5 0Bps / 39Bps diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap index 42e4e17..857fa24 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 3 3 3 3 3 7 (tcp) 5 32 46 - 1 7 6 1 1 1 1 2 45 (tcp) 1 7 6 + 5 32 46 5 => 3.3.3.3:1 37 5 32 46 + 1 7 6 => 1.1.1.1:12 45 1 7 6 diff --git a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap index 7b0d9ba..908ae2e 100644 --- a/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap +++ b/src/tests/cases/snapshots/ui__sustained_traffic_from_multiple_processes_bi_directional.snap @@ -7,7 +7,7 @@ expression: "&terminal_draw_events_mirror[1]" 1 1 57Bps / 61Bps :443 => 1.1.1.1:12345 (tcp) 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :443 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps + 5 1 34Bps / 37Bps :4435 => 3.3.3.3:1337 (tcp) 5 34Bps / 37Bps diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap index 0fff950..712bc0b 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names-2.snap @@ -6,8 +6,8 @@ expression: "&terminal_draw_events_mirror[2]" - 5 32 46 three.thre three.three:13 5 32 46 - 1 7 6 one.one.on one:12345 (tcp 1 7 6 + 5 32 46 5 => three.thr e.three.three:1 5 32 46 + 1 7 6 => one.one.on .one:12345 (tcp 1 7 6 diff --git a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap index 959b701..a35adad 100644 --- a/src/tests/cases/snapshots/ui__traffic_with_host_names.snap +++ b/src/tests/cases/snapshots/ui__traffic_with_host_names.snap @@ -7,7 +7,7 @@ expression: "&terminal_draw_events_mirror[1]" 1 1 57Bps / 61Bps :443 => one.one.one.one:12345 (tcp 1 57Bps / 61Bps - 5 1 34Bps / 37Bps :443 => three.three.three.three:13 5 34Bps / 37Bps + 5 1 34Bps / 37Bps :4435 => three.three.three.three:1 5 34Bps / 37Bps diff --git a/src/tests/cases/ui.rs b/src/tests/cases/ui.rs index 2f1f756..c639439 100644 --- a/src/tests/cases/ui.rs +++ b/src/tests/cases/ui.rs @@ -129,17 +129,17 @@ fn bi_directional_traffic() { fn multiple_packets_of_traffic_from_different_connections() { let network_frames = vec![NetworkFrames::new(vec![ Some(build_tcp_packet( - "1.1.1.1", + "2.2.2.2", "10.0.0.2", 12345, 443, - b"I have come from 1.1.1.1", + b"I have come from 2.2.2.2", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"I come from 2.2.2.2", )), ]) as Box]; @@ -212,11 +212,11 @@ fn one_process_with_multiple_connections() { b"I have come from 1.1.1.1", )), Some(build_tcp_packet( - "3.3.3.3", + "1.1.1.1", "10.0.0.2", - 1337, + 12346, 443, - b"Funny that, I'm from 3.3.3.3", + b"Funny that, I'm from 1.1.1.1", )), ]) as Box]; @@ -253,21 +253,21 @@ fn multiple_processes_with_multiple_connections() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really nice!", )), Some(build_tcp_packet( "4.4.4.4", "10.0.0.2", 1337, - 443, + 4432, b"I'm partial to 4.4.4.4", )), ]) as Box]; @@ -383,7 +383,7 @@ fn sustained_traffic_from_multiple_processes() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I come from 3.3.3.3", )), None, // sleep @@ -398,7 +398,7 @@ fn sustained_traffic_from_multiple_processes() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I come 3.3.3.3 one second later", )), ]) as Box]; @@ -429,7 +429,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -437,7 +437,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -458,7 +458,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -466,7 +466,7 @@ fn sustained_traffic_from_multiple_processes_bi_directional() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( @@ -511,7 +511,7 @@ fn traffic_with_host_names() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -519,7 +519,7 @@ fn traffic_with_host_names() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -540,7 +540,7 @@ fn traffic_with_host_names() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -548,7 +548,7 @@ fn traffic_with_host_names() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( @@ -620,7 +620,7 @@ fn no_resolve_mode() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"omw to 3.3.3.3", )), @@ -628,7 +628,7 @@ fn no_resolve_mode() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"I was just there!", )), Some(build_tcp_packet( @@ -649,7 +649,7 @@ fn no_resolve_mode() { Some(build_tcp_packet( "10.0.0.2", "3.3.3.3", - 443, + 4435, 1337, b"Wait for me!", )), @@ -657,7 +657,7 @@ fn no_resolve_mode() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"They're waiting for you...", )), Some(build_tcp_packet( @@ -785,21 +785,21 @@ fn layout_full_width_under_30_height() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really nice!", )), Some(build_tcp_packet( "4.4.4.4", "10.0.0.2", 1337, - 443, + 4432, b"I'm partial to 4.4.4.4", )), ]) as Box]; @@ -838,21 +838,21 @@ fn layout_under_150_width_full_height() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really nice!", )), Some(build_tcp_packet( "4.4.4.4", "10.0.0.2", 1337, - 443, + 4432, b"I'm partial to 4.4.4.4", )), ]) as Box]; @@ -891,21 +891,21 @@ fn layout_under_150_width_under_30_height() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really nice!", )), Some(build_tcp_packet( "4.4.4.4", "10.0.0.2", 1337, - 443, + 4432, b"I'm partial to 4.4.4.4", )), ]) as Box]; @@ -943,21 +943,21 @@ fn layout_under_120_width_full_height() { "3.3.3.3", "10.0.0.2", 1337, - 443, + 4435, b"Awesome, I'm from 3.3.3.3", )), Some(build_tcp_packet( "2.2.2.2", "10.0.0.2", 54321, - 443, + 4434, b"You know, 2.2.2.2 is really