shlist

commit 193b987688edb112fa91b9b5614c68f13b57c1b1
parent d4d161ca3611621333c26511097a1893880a7ed1
Author: kyle <kyle@getaddrinfo.net>
Date:   Wed, 30 Dec 2015 14:02:09 -0700

tests: fold add_friend_bad_phnum into add_friend

Diffstat:
M
tests/add_friend/server.log.good
 | 
4
++++
M
tests/add_friend/test.pl
 | 
25
+++++++++++++++++++++----
D
tests/add_friend_bad_num/Makefile
 | 
1
-
D
tests/add_friend_bad_num/server.log.good
 | 
7
-------
D
tests/add_friend_bad_num/test.pl
 | 
23
-----------------------

5 files changed, 25 insertions(+), 35 deletions(-)
diff --git a/tests/add_friend/server.log.good b/tests/add_friend/server.log.good
@@ -3,4 +3,8 @@ new connection (pid = <digits>)
 ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256'
 new_device: success, <digits>:<base64> os <base64>
 add_friend: <base64> adding <digits>
+add_friend: <base64> adding <base64>
+add_friend: bad friends number <base64>
+add_friend: <base64> adding <digits>
+add_friend: bad friends number <digits>
 disconnected!
diff --git a/tests/add_friend/test.pl b/tests/add_friend/test.pl
@@ -8,15 +8,32 @@ use test;
 # - adds a new friend
 
 my $sock = new_socket();
+my $friend1 = "4033217654";
+my $friend2 = "4033217654bad";
+my $msg_good = "friends phone number is not a valid phone number";
 
 send_msg($sock, 'new_device', "4038675309\0unix");
 my ($msg_data) = recv_msg($sock, 'new_device');
 
 my $device_id = check_status($msg_data, 'ok');
-my $friend_phnum = "4033217654";
 
-send_msg($sock, 'add_friend', "$device_id\0$friend_phnum");
+# first verify that a normal add_friend message succeeds
+send_msg($sock, 'add_friend', "$device_id\0$friend1");
 ($msg_data) = recv_msg($sock, 'add_friend');
 
-my $msg = check_status($msg_data, 'ok');
-fail "got response ph num '$msg' expected '$friend_phnum'" if ($msg ne $friend_phnum);
+my $phnum = check_status($msg_data, 'ok');
+fail "got response ph num '$phnum' expected '$friend1'" if ($phnum ne $friend1);
+
+# also verify that a non numeric friends phone number isn't accepted
+send_msg($sock, 'add_friend', "$device_id\0$friend2");
+($msg_data) = recv_msg($sock, 'add_friend');
+
+my $msg = check_status($msg_data, 'err');
+fail "unexpected error message '$msg', expecting '$msg_good'" if ($msg ne $msg_good);
+
+# also verify an empty phone number isn't accepted
+send_msg($sock, 'add_friend', "$device_id\0");
+($msg_data) = recv_msg($sock, 'add_friend');
+
+$msg = check_status($msg_data, 'err');
+fail "unexpected error message '$msg', expecting '$msg_good'" if ($msg ne $msg_good);
diff --git a/tests/add_friend_bad_num/Makefile b/tests/add_friend_bad_num/Makefile
@@ -1 +0,0 @@
-include ../test.mk
diff --git a/tests/add_friend_bad_num/server.log.good b/tests/add_friend_bad_num/server.log.good
@@ -1,7 +0,0 @@
-accepting connections on <ip>:<port> (pid = <digits>)
-new connection (pid = <digits>)
-ssl ok, ver = 'TLSv1_2' cipher = 'ECDHE-RSA-AES128-SHA256'
-new_device: success, <digits>:<base64> os <base64>
-add_friend: <base64> adding <base64>
-add_friend: bad friends number <base64>
-disconnected!
diff --git a/tests/add_friend_bad_num/test.pl b/tests/add_friend_bad_num/test.pl
@@ -1,23 +0,0 @@
-#!/usr/bin/perl -I../
-use strict;
-use warnings;
-use test;
-
-# this test:
-# - gets a new device id
-# - tries adding a new friend with a non numeric phone number
-
-my $sock = new_socket();
-
-send_msg($sock, 'new_device', "4038675309\0unix");
-my ($msg_data) = recv_msg($sock, 'new_device');
-
-my $device_id = check_status($msg_data, 'ok');
-my $friend_phnum = "4033217654bad";
-
-send_msg($sock, 'add_friend', "$device_id\0$friend_phnum");
-($msg_data) = recv_msg($sock, 'add_friend');
-
-my $msg = check_status($msg_data, 'err');
-my $msg_good = "friends phone number is not a valid phone number";
-fail "unexpected error message '$msg', was expecting '$msg_good'" if ($msg ne $msg_good);