From d705192a412b4cc4b33a8e84bbc2e380671990f5 Mon Sep 17 00:00:00 2001
From: Graham Clark <grclark@gmail.com>
Date: Sat, 27 Jun 2020 00:03:05 -0400
Subject: [PATCH] More CLI and UI tests for termshark.

These are intended to be "black-box" tests - running termshark itself,
checking CLI options and - for now in a very simple fashion - some TUI
behavior.
---
 scripts/pcaps/telnet-cooked.pcap | Bin 0 -> 9244 bytes
 scripts/simple-tests.sh          |  41 +++++++++++++++++++++++++++----
 2 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 scripts/pcaps/telnet-cooked.pcap

diff --git a/scripts/pcaps/telnet-cooked.pcap b/scripts/pcaps/telnet-cooked.pcap
new file mode 100644
index 0000000000000000000000000000000000000000..34515d415da7a543efe73bde6e50a22c4e43d1e5
GIT binary patch
literal 9244
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
D*0>iw

literal 0
HcmV?d00001

diff --git a/scripts/simple-tests.sh b/scripts/simple-tests.sh
index 669c399..f94a6b6 100755
--- a/scripts/simple-tests.sh
+++ b/scripts/simple-tests.sh
@@ -40,19 +40,50 @@ a82c7bc0a82cd5f9
 7400
 EOF
 
-echo Running termshark.
+echo Running termshark cli tests.
 
-$GOPATH/bin/termshark -r /tmp/test.pcap | grep 192.168.44.123
+# if timeout is invoked because termshark is stuck, the exit code will be non-zero
+export TS="timeout 10s $GOPATH/bin/termshark"
 
-echo Running basic UI tests.
+# stdout is not a tty, so falls back to tshark
+$TS -r /tmp/test.pcap | grep '192.168.44.213 TFTP 77'
+
+[[ $($TS -r /tmp/test.pcap -T psml -n | grep '<packet>' | wc -l) == 2 ]]
+
+# only display the second line via tshark
+[[ $($TS -r /tmp/test.pcap 'frame.number == 2' | wc -l) == 1 ]]
+
+[[ $($TS -r /tmp/test.pcap --pass-thru | wc -l) == 2 ]]
+
+[[ $($TS -r /tmp/test.pcap --pass-thru=true | wc -l) == 2 ]]
+
+# run in script so termshark thinks it's in a tty
+cat version.go | grep -o -E "v[0-9]+\.[0-9]+(\.[0-9]+)?" | \
+    xargs -i bash -c "script -q -e -c \"$TS -v\" | grep {}"
+
+echo Running termshark UI tests.
 
 # Load a pcap, quit
 { sleep 5s ; echo q ; echo ; } | \
-    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $GOPATH/bin/termshark -r /tmp/test.pcap\\\"",pty,setsid,ctty 
+    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $TS -r /tmp/test.pcap\\\"",pty,setsid,ctty 
+
+# Run with stdout not a tty, but disable the pass-thru to tshark
+{ sleep 5s ; echo q ; echo ; } | \
+    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $TS -r /tmp/test.pcap --pass-thru=false | cat\\\"",pty,setsid,ctty 
 
 # Load a pcap, very rudimentary scrape for an IP, quit
 { sleep 5s ; echo q ; echo ; } | \
-    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $GOPATH/bin/termshark -r /tmp/test.pcap\\\"",pty,setsid,ctty | \
+    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $TS -r /tmp/test.pcap\\\"",pty,setsid,ctty | \
+    grep -a 192.168.44.123 > /dev/null
+
+# Load a pcap from stdin
+{ sleep 5s ; echo q ; echo ; } | \
+    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && cat /tmp/test.pcap | TERM=xterm $TS -i -\\\"",pty,setsid,ctty | \
     grep -a 192.168.44.123 > /dev/null
 
+# Display filter at end of command line
+{ sleep 5s ; echo q ; echo ; } | \
+    socat - EXEC:"sh -c \\\"stty rows 50 cols 80 && TERM=xterm $TS -r scripts/pcaps/telnet-cooked.pcap \'frame.number == 2\'\\\"",pty,setsid,ctty | \
+    grep -a "Frame 2: 74 bytes" > /dev/null
+
 echo Tests were successful.