Skip to content

Commit

Permalink
test tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@kraih
kraih committed Oct 24, 2012
1 parent 6b59143 commit 31315df
Show file tree
Hide file tree
Showing 11 changed files with 48 additions and 45 deletions.
3 changes: 3 additions & 0 deletions Changes
View file
@@ -1,4 +1,7 @@

3.52 2012-10-24
- Improved tests.

3.51 2012-10-23
- Improved documentation.
- Improved tests.
Expand Down
2 changes: 1 addition & 1 deletion lib/Mojolicious.pm
View file
Expand Up @@ -38,7 +38,7 @@ has static => sub { Mojolicious::Static->new };
has types => sub { Mojolicious::Types->new };

our $CODENAME = 'Rainbow';
our $VERSION = '3.51';
our $VERSION = '3.52';

sub AUTOLOAD {
my $self = shift;
Expand Down
2 changes: 1 addition & 1 deletion t/mojo/app.t
View file
Expand Up @@ -236,7 +236,7 @@ is $tx->res->code, 200, 'right status';
is $tx->res->body, $result, 'right content';

# Upload
($code, $body) = undef;
($code, $body) = ();
$tx = $ua->post_form(
"http://127.0.0.1:$port/upload" => {file => {content => $result}});
is $tx->res->code, 200, 'right status';
Expand Down
2 changes: 1 addition & 1 deletion t/mojo/delay.t
View file
Expand Up @@ -95,7 +95,7 @@ is_deeply [$delay->wait], [2, 3, 4], 'right numbers';
is_deeply $result, [2, 3, 4], 'right numbers';

# Nested delays
($finished, $result) = undef;
($finished, $result) = ();
$delay = Mojo::IOLoop->delay(
sub {
my $first = shift;
Expand Down
18 changes: 9 additions & 9 deletions t/mojo/ioloop_tls.t
View file
Expand Up @@ -67,7 +67,7 @@ is $client, 'test321', 'right content';
# Valid client certificate
$delay = Mojo::IOLoop->delay;
$port = Mojo::IOLoop->generate_port;
($server, $client) = undef;
($server, $client) = ();
my ($remove, $running, $timeout, $server_err, $server_close, $client_close);
Mojo::IOLoop->remove(Mojo::IOLoop->recurring(0 => sub { $remove++ }));
$delay->begin;
Expand Down Expand Up @@ -138,7 +138,7 @@ Mojo::IOLoop->start;
ok $client_err, 'has error';

# Missing client certificate
($server_err, $client_err) = undef;
($server_err, $client_err) = ();
Mojo::IOLoop->client(
{port => $port, tls => 1} => sub {
shift->stop;
Expand All @@ -152,7 +152,7 @@ ok $client_err, 'has error';
# Invalid certificate authority (server)
$loop = Mojo::IOLoop->new;
$port = Mojo::IOLoop->generate_port;
($server_err, $client_err) = undef;
($server_err, $client_err) = ();
$loop->server(
address => '127.0.0.1',
port => $port,
Expand All @@ -179,8 +179,8 @@ ok $client_err, 'has error';
# Valid client and server certificates
$delay = Mojo::IOLoop->delay;
$port = Mojo::IOLoop->generate_port;
($running, $timeout, $server, $server_err, $server_close) = undef;
($client, $client_close) = undef;
($running, $timeout, $server, $server_err, $server_close) = ();
($client, $client_close) = ();
$delay->begin;
Mojo::IOLoop->server(
address => '127.0.0.1',
Expand Down Expand Up @@ -236,7 +236,7 @@ ok !$server_err, 'no error';
# Invalid server certificate (unsigned)
$loop = Mojo::IOLoop->new;
$port = Mojo::IOLoop->generate_port;
($server_err, $client_err) = undef;
($server_err, $client_err) = ();
$loop->server(
address => '127.0.0.1',
port => $port,
Expand All @@ -261,7 +261,7 @@ ok $client_err, 'has error';
# Invalid server certificate (hostname)
$loop = Mojo::IOLoop->new;
$port = Mojo::IOLoop->generate_port;
($server_err, $client_err) = undef;
($server_err, $client_err) = ();
$loop->server(
address => '127.0.0.1',
port => $port,
Expand All @@ -287,7 +287,7 @@ ok $client_err, 'has error';
# Invalid certificate authority (client)
$loop = Mojo::IOLoop->new;
$port = Mojo::IOLoop->generate_port;
($server_err, $client_err) = undef;
($server_err, $client_err) = ();
$loop->server(
address => '127.0.0.1',
port => $port,
Expand All @@ -312,7 +312,7 @@ ok $client_err, 'has error';
# Ignore invalid client certificate
$loop = Mojo::IOLoop->new;
$port = Mojo::IOLoop->generate_port;
($server, $client, $client_err) = undef;
($server, $client, $client_err) = ();
$loop->server(
address => '127.0.0.1',
port => $port,
Expand Down
24 changes: 12 additions & 12 deletions t/mojo/reactor_ev.t
View file
Expand Up @@ -60,7 +60,7 @@ ok $reactor->is_readable($listen), 'handle is readable';
# Accept
my $server = $listen->accept;
$reactor->remove($listen);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($client => sub { pop() ? $writable++ : $readable++ });
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
Expand All @@ -69,32 +69,32 @@ ok $writable, 'handle is writable';
print $client "hello!\n";
sleep 1;
$reactor->remove($client);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($server => sub { pop() ? $writable++ : $readable++ });
$reactor->watch($server, 1, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 1, 1);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok $writable, 'handle is writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 0, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok !$readable, 'handle is not readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 1, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($server => sub { pop() ? $writable++ : $readable++ });
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
Expand All @@ -106,37 +106,37 @@ my ($timer, $recurring);
$reactor->timer(0 => sub { $timer++ });
$reactor->remove($reactor->timer(0 => sub { $timer++ }));
my $id = $reactor->recurring(0 => sub { $recurring++ });
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok $timer, 'timer was triggered';
ok $recurring, 'recurring was triggered';
my $done;
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { $done = shift->is_running });
$reactor->one_tick while !$done;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
$reactor->remove($id);
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
Expand All @@ -147,7 +147,7 @@ ok !$recurring, 'recurring was not triggered again';
# Reset
$reactor->remove($id);
$reactor->remove($server);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok !$readable, 'io event was not triggered again';
Expand Down
24 changes: 12 additions & 12 deletions t/mojo/reactor_poll.t
View file
Expand Up @@ -59,7 +59,7 @@ ok $reactor->is_readable($listen), 'handle is readable';
# Accept
my $server = $listen->accept;
$reactor->remove($listen);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($client => sub { pop() ? $writable++ : $readable++ });
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
Expand All @@ -68,32 +68,32 @@ ok $writable, 'handle is writable';
print $client "hello!\n";
sleep 1;
$reactor->remove($client);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($server => sub { pop() ? $writable++ : $readable++ });
$reactor->watch($server, 1, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 1, 1);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok $writable, 'handle is writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 0, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok !$readable, 'handle is not readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->watch($server, 1, 0);
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable';
ok !$writable, 'handle is not writable';
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->io($server => sub { pop() ? $writable++ : $readable++ });
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
Expand All @@ -105,37 +105,37 @@ my ($timer, $recurring);
$reactor->timer(0 => sub { $timer++ });
$reactor->remove($reactor->timer(0 => sub { $timer++ }));
my $id = $reactor->recurring(0 => sub { $recurring++ });
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok $timer, 'timer was triggered';
ok $recurring, 'recurring was triggered';
my $done;
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { $done = shift->is_running });
$reactor->one_tick while !$done;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
ok $writable, 'handle is writable again';
ok !$timer, 'timer was not triggered';
ok $recurring, 'recurring was triggered again';
$reactor->remove($id);
($readable, $writable, $timer, $recurring) = undef;
($readable, $writable, $timer, $recurring) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok $readable, 'handle is readable again';
Expand All @@ -146,7 +146,7 @@ ok !$recurring, 'recurring was not triggered again';
# Reset
$reactor->remove($id);
$reactor->remove($server);
($readable, $writable) = undef;
($readable, $writable) = ();
$reactor->timer(0.025 => sub { shift->stop });
$reactor->start;
ok !$readable, 'io event was not triggered again';
Expand Down
6 changes: 3 additions & 3 deletions t/mojo/user_agent.t
View file
Expand Up @@ -212,7 +212,7 @@ is $tx->res->code, 200, 'right status';
is $tx->res->body, 'works!', 'right content';

# GET /no_length (missing Content-Length header)
($finished_req, $finished_tx, $finished_res) = undef;
($finished_req, $finished_tx, $finished_res) = ();
$tx = $ua->build_tx(GET => '/no_length');
ok !$tx->is_finished, 'transaction is not finished';
$ua->once(
Expand Down Expand Up @@ -253,7 +253,7 @@ is $tx->res->code, 200, 'right status';
is $tx->res->body, 'works!', 'right content';

# POST /echo (non-blocking form)
($success, $code, $body) = undef;
($success, $code, $body) = ();
$ua->post_form(
'/echo' => {hello => 'world'} => sub {
my ($self, $tx) = @_;
Expand All @@ -269,7 +269,7 @@ is $code, 200, 'right status';
is $body, 'hello=world', 'right content';

# POST /echo (non-blocking JSON)
($success, $code, $body) = undef;
($success, $code, $body) = ();
$ua->post_json(
'/echo' => {hello => 'world'} => sub {
my ($self, $tx) = @_;
Expand Down
6 changes: 3 additions & 3 deletions t/mojo/websocket.t
View file
Expand Up @@ -276,7 +276,7 @@ is $denied, 1, 'finished websocket';

# WebSocket /subreq
$finished = 0;
($code, $result) = undef;
($code, $result) = ();
$ua->websocket(
'/subreq' => sub {
my $tx = pop;
Expand Down Expand Up @@ -305,7 +305,7 @@ is $subreq, 1, 'finished server websocket';
# WebSocket /subreq (parallel)
my $delay = Mojo::IOLoop->delay;
$finished = 0;
($code, $result) = undef;
($code, $result) = ();
my ($code2, $result2);
$delay->begin;
$ua->websocket(
Expand Down Expand Up @@ -437,7 +437,7 @@ is $code, 500, 'right status';
is $msg, 'Internal Server Error', 'right message';

# WebSocket /foo (forbidden)
($websocket, $code, $msg) = undef;
($websocket, $code, $msg) = ();
$ua->websocket(
'/foo' => sub {
my $tx = pop;
Expand Down
2 changes: 1 addition & 1 deletion t/mojo/websocket_proxy.t
View file
Expand Up @@ -173,7 +173,7 @@ ok !$kept_alive, 'connection was not kept alive';
is $result, 'http://kraih.com/proxy', 'right content';

# WebSocket /test (kept alive proxy websocket)
($kept_alive, $result) = undef;
($kept_alive, $result) = ();
$ua->websocket(
"ws://localhost:$port/test" => sub {
my ($ua, $tx) = @_;
Expand Down
4 changes: 2 additions & 2 deletions t/mojo/websocket_proxy_tls.t
View file
Expand Up @@ -225,7 +225,7 @@ ok !$kept_alive, 'connection was not kept alive';
is $result, "https://localhost:$port/proxy", 'right content';

# GET /proxy (kept alive proxy request)
($kept_alive, $result) = undef;
($kept_alive, $result) = ();
$ua->get(
"https://localhost:$port/proxy" => sub {
my ($ua, $tx) = @_;
Expand All @@ -240,7 +240,7 @@ ok $kept_alive, 'connection was kept alive';

# WebSocket /test (kept alive proxy websocket)
$ua->https_proxy("http://localhost:$proxy");
($kept_alive, $result) = undef;
($kept_alive, $result) = ();
$ua->websocket(
"wss://localhost:$port/test" => sub {
my ($ua, $tx) = @_;
Expand Down

0 comments on commit 31315df

Please sign in to comment.