commit 89154444ada1f21b0f0d605f79b87899d03346b1
parent cdaba0c7f67e9e62fee58636de81d78e90964f98
Author: kyle <kyle@getaddrinfo.net>
Date: Sat, 21 Nov 2015 12:54:18 -0700
tests: fix to use new auto generated lookup structures
Diffstat:
6 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/tests/double_register/test.pl b/tests/double_register/test.pl
@@ -1,13 +1,10 @@
#!/usr/bin/perl -I../
-
use strict;
use warnings;
-
-use msgs;
use testlib;
my $sock = new_socket();
-send_msg($sock, $msgs{new_device}, "4038675309");
+send_msg($sock, $msg_num{new_device}, "4038675309");
my ($type, $response, $length) = recv_msg($sock);
# verify response length is 32 random bytes encoded with base64
@@ -15,4 +12,4 @@ if ($length != 43) {
fail "expected response length of 43, got $length";
}
-send_msg($sock, $msgs{new_device}, "4038675309");
+send_msg($sock, $msg_num{new_device}, "4038675309");
diff --git a/tests/msgs.pl b/tests/msgs.pl
@@ -0,0 +1 @@
+../msgs.pl
+\ No newline at end of file
diff --git a/tests/msgs.pm b/tests/msgs.pm
@@ -1 +0,0 @@
-../msgs.pm
-\ No newline at end of file
diff --git a/tests/new_device/test.pl b/tests/new_device/test.pl
@@ -1,13 +1,10 @@
#!/usr/bin/perl -I../
-
use strict;
use warnings;
-
-use msgs;
use testlib;
my $sock = new_socket();
-send_msg($sock, $msgs{new_device}, "4038675309");
+send_msg($sock, $msg_num{new_device}, "4038675309");
my ($type, $response, $length) = recv_msg($sock);
close $sock;
diff --git a/tests/new_device_bad_phnum/test.pl b/tests/new_device_bad_phnum/test.pl
@@ -1,12 +1,9 @@
#!/usr/bin/perl -I../
-
use strict;
use warnings;
-
-use msgs;
use testlib;
# send a new device message with a bad phone number
my $sock = new_socket();
-send_msg($sock, $msgs{new_device}, "403867530&");
+send_msg($sock, $msg_num{new_device}, "403867530&");
close($sock);
diff --git a/tests/testlib.pm b/tests/testlib.pm
@@ -5,7 +5,10 @@ use warnings;
use Exporter qw(import);
use IO::Socket;
-our @EXPORT = qw(new_socket fail send_msg recv_msg);
+require "msgs.pl";
+our (%msg_num, @msg_str, @msg_func, $protocol_ver);
+
+our @EXPORT = qw(new_socket fail send_msg recv_msg %msg_num);
sub fail {
print shift;