=================================================================== RCS file: /cvs/HOPE/Net-OpenAMD/t/local_server.t,v retrieving revision 1.8 retrieving revision 1.10 diff -u -r1.8 -r1.10 --- HOPE/Net-OpenAMD/t/local_server.t 2010/06/28 21:34:14 1.8 +++ HOPE/Net-OpenAMD/t/local_server.t 2010/06/30 06:30:17 1.10 @@ -1,6 +1,6 @@ #!perl -# $AFresh1: local_server.t,v 1.7 2010/06/27 03:59:32 andrew Exp $ -use Test::More tests => 15; +# $AFresh1: local_server.t,v 1.9 2010/06/28 20:40:38 andrew Exp $ +use Test::More; use strict; use warnings; @@ -13,11 +13,95 @@ use lib "$FindBin::Bin/../../mojo/lib"; eval "use Test::Mojo::Server"; - plan skip_all => "Test::Mojo::Server required for testing local server" - if $@; + if ($@) { + plan skip_all => "Test::Mojo::Server required for testing local server"; + } + else { + plan tests => 15; + } require 'network_tests.t'; } +my %tests = ( + location => [ + { args => undef, + expect => [ + { 'y' => '83.1452331542969', + 'area' => 'Engressia', + 'time' => 2387, + 'user' => 12983, + 'x' => '46.7369918823242', + 'button' => 'False' + } + ], + }, + ], + speakers => [ + { args => undef, + expect => [ + { 'name' => 'Johnny', + 'bio' => 'Johnny\'s bio' + }, + ], + }, + ], + talks => [ + { args => undef, + expect => [ + { 'speakers' => [ 'Judas', 'JohnnyX' ], + 'interests' => [ 'media', 'crypto' ], + 'time' => '2008/7/18 13:00:00', + 'track' => 'Hooper', + 'title' => 'Ancient Egyptian Music and DRM', + 'abstract' => + 'A discussion of the development of musical notation, which was designed as a means of reproducing music while making it impossible for the general public to perform without permission.' + } + ], + }, + ], + interests => [ + { args => undef, + expect => [ + 'new tech', 'activism', + 'radio', 'lockpicking', + 'crypto', 'privacy', + 'ethics', 'telephones', + 'social engineering', 'hacker spaces', + 'hardware hacking', 'nostalgia', + 'communities', 'science', + 'government', 'network security', + 'malicious software', 'pen testing', + 'web', 'niche hacks', + 'media', + ], + }, + ], + users => [ + { args => undef, + expect => [ + { 'name' => 'JohnnyX', + 'x' => '32.54091324', + 'y' => '54.10958384', + 'interests' => [ + 'new tech', 'radio', + 'lockpicking', 'crypto', + 'telephones', 'social engineering', + 'hacker spaces', 'hardware hacking', + 'nostalgia', 'communities', + 'science', 'network security', + 'malicious software', 'pen testing' + ], + } + ] + }, + ], + stats => [ + { args => undef, + expect => qr/^Unused \s feature/xms, + }, + ], +); + my $server = Test::Mojo::Server->new(); $server->executable('test_server.pl'); @@ -27,7 +111,7 @@ my $amd = Net::OpenAMD->new( { base_uri => 'http://127.0.0.1:' . $port . '/api/', } ); -NetworkTests::run_tests($amd); +NetworkTests::run_tests( $amd, \%tests ); $server->stop_server_ok('server stopped');