Skip to content

Commit d1428d4

Browse files
iph0iph0
committed
Refactoring of unit test
1 parent 85b00f1 commit d1428d4

File tree

9 files changed

+149
-161
lines changed

9 files changed

+149
-161
lines changed

‎t/00-base.t‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,22 +4,22 @@ use warnings;
44

55
use Test::More tests => 8;
66

7-
my $T_CLIENT_CLASS;
8-
my $T_ERR_CLASS;
7+
my $t_client_class;
8+
my $t_err_class;
99

1010
BEGIN {
11-
$T_CLIENT_CLASS = 'AnyEvent::RipeRedis';
12-
use_ok( $T_CLIENT_CLASS );
11+
$t_client_class = 'AnyEvent::RipeRedis';
12+
use_ok( $t_client_class );
1313

14-
$T_ERR_CLASS = 'AnyEvent::RipeRedis::Error';
15-
use_ok( $T_ERR_CLASS );
14+
$t_err_class = 'AnyEvent::RipeRedis::Error';
15+
use_ok( $t_err_class );
1616
}
1717

18-
can_ok( $T_CLIENT_CLASS, 'new' );
19-
my $redis = new_ok( $T_CLIENT_CLASS );
18+
can_ok( $t_client_class, 'new' );
19+
my $redis = new_ok( $t_client_class );
2020

21-
can_ok( $T_ERR_CLASS, 'new' );
22-
my $err = new_ok( $T_ERR_CLASS => [ 'Some error', 9 ] );
21+
can_ok( $t_err_class, 'new' );
22+
my $err = new_ok( $t_err_class => [ 'Some error', 9 ] );
2323

2424
can_ok( $err, 'message' );
2525
can_ok( $err, 'code' );

‎t/02-accessors.t‎

Lines changed: 40 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ use Test::More tests => 37;
66
use AnyEvent::RipeRedis qw( :err_codes );
77
use AnyEvent::RipeRedis::Error;
88

9-
my $REDIS = AnyEvent::RipeRedis->new(
9+
my $redis = AnyEvent::RipeRedis->new(
1010
password => 'test',
1111
connection_timeout => 10,
1212
read_timeout => 5,
@@ -27,65 +27,58 @@ my $REDIS = AnyEvent::RipeRedis->new(
2727
},
2828
);
2929

30-
can_ok( $REDIS, 'host' );
31-
can_ok( $REDIS, 'port' );
32-
can_ok( $REDIS, 'database' );
33-
can_ok( $REDIS, 'connection_timeout' );
34-
can_ok( $REDIS, 'read_timeout' );
35-
can_ok( $REDIS, 'utf8' );
36-
can_ok( $REDIS, 'reconnect' );
37-
can_ok( $REDIS, 'on_connect' );
38-
can_ok( $REDIS, 'on_disconnect' );
39-
can_ok( $REDIS, 'on_error' );
40-
41-
t_host($REDIS);
42-
t_port($REDIS);
43-
t_database($REDIS);
44-
t_conn_timeout($REDIS);
45-
t_read_timeout($REDIS);
46-
t_reconnect($REDIS);
47-
t_min_reconnect_interval($REDIS);
48-
t_utf8($REDIS);
49-
t_on_connect($REDIS);
50-
t_on_disconnect($REDIS);
51-
t_on_error($REDIS);
30+
can_ok( $redis, 'host' );
31+
can_ok( $redis, 'port' );
32+
can_ok( $redis, 'database' );
33+
can_ok( $redis, 'connection_timeout' );
34+
can_ok( $redis, 'read_timeout' );
35+
can_ok( $redis, 'utf8' );
36+
can_ok( $redis, 'reconnect' );
37+
can_ok( $redis, 'on_connect' );
38+
can_ok( $redis, 'on_disconnect' );
39+
can_ok( $redis, 'on_error' );
40+
41+
t_host($redis);
42+
t_port($redis);
43+
t_database($redis);
44+
t_conn_timeout($redis);
45+
t_read_timeout($redis);
46+
t_reconnect($redis);
47+
t_min_reconnect_interval($redis);
48+
t_utf8($redis);
49+
t_on_connect($redis);
50+
t_on_disconnect($redis);
51+
t_on_error($redis);
5252

5353

5454
sub t_host {
5555
my $redis = shift;
5656

57-
my $t_host = $redis->host;
58-
59-
is( $t_host, 'localhost', 'get host' );
57+
is( $redis->host, 'localhost', 'get host' );
6058

6159
return;
6260
}
6361

6462
sub t_port {
6563
my $redis = shift;
6664

67-
my $t_port = $redis->port;
68-
69-
is( $t_port, 6379, 'get port' );
65+
is( $redis->port, 6379, 'get port' );
7066

7167
return;
7268
}
7369

7470
sub t_database {
7571
my $redis = shift;
7672

77-
my $t_db_index = $redis->database;
78-
79-
is( $t_db_index, 0, 'get database index' );
73+
is( $redis->database, 0, 'get database index' );
8074

8175
return;
8276
}
8377

8478
sub t_conn_timeout {
8579
my $redis = shift;
8680

87-
my $t_conn_timeout = $redis->connection_timeout;
88-
is( $t_conn_timeout, 10, q{get "connection_timeout"} );
81+
is( $redis->connection_timeout, 10, q{get "connection_timeout"} );
8982

9083
$redis->connection_timeout(undef);
9184
is( $redis->connection_timeout, undef,
@@ -100,8 +93,7 @@ sub t_conn_timeout {
10093
sub t_read_timeout {
10194
my $redis = shift;
10295

103-
my $t_read_timeout = $redis->read_timeout;
104-
is( $t_read_timeout, 5, q{get "read_timeout"} );
96+
is( $redis->read_timeout, 5, q{get "read_timeout"} );
10597

10698
$redis->read_timeout(undef);
10799
is( $redis->read_timeout, undef, q{disable "read_timeout"} );
@@ -115,8 +107,7 @@ sub t_read_timeout {
115107
sub t_reconnect {
116108
my $redis = shift;
117109

118-
my $reconn_state = $redis->reconnect;
119-
is( $reconn_state, 1, q{get current reconnection mode state} );
110+
is( $redis->reconnect, 1, q{get current reconnection mode state} );
120111

121112
$redis->reconnect(undef);
122113
is( $redis->reconnect, undef, q{disable reconnection mode} );
@@ -130,8 +121,7 @@ sub t_reconnect {
130121
sub t_min_reconnect_interval {
131122
my $redis = shift;
132123

133-
my $t_min_reconnect_interval = $redis->min_reconnect_interval;
134-
is( $t_min_reconnect_interval, 5, q{get "min_reconnect_interval"} );
124+
is( $redis->min_reconnect_interval, 5, q{get "min_reconnect_interval"} );
135125

136126
$redis->min_reconnect_interval(undef);
137127
is( $redis->min_reconnect_interval, undef,
@@ -146,8 +136,7 @@ sub t_min_reconnect_interval {
146136
sub t_utf8 {
147137
my $redis = shift;
148138

149-
my $utf8_state = $redis->utf8;
150-
is( $utf8_state, 1, q{get current UTF8 mode state} );
139+
is( $redis->utf8, 1, q{get current UTF8 mode state} );
151140

152141
$redis->utf8(undef);
153142
is( $redis->utf8, undef, q{disable UTF8 mode} );
@@ -161,46 +150,43 @@ sub t_utf8 {
161150
sub t_on_connect {
162151
my $redis = shift;
163152

164-
my $on_conn = $redis->on_connect;
165-
is( $on_conn->(), 1, q{get "on_connect" callback} );
153+
is( $redis->on_connect->(), 1, q{get "on_connect" callback} );
166154

167155
$redis->on_connect(undef);
168156
is( $redis->on_connect, undef, q{disable "on_connect" callback} );
169157

170158
$redis->on_connect(
171159
sub {
172-
return 5;
160+
return 4;
173161
}
174162
);
175-
is( $redis->on_connect->(), 5, q{set "on_connect" callback} );
163+
is( $redis->on_connect->(), 4, q{set "on_connect" callback} );
176164

177165
return;
178166
}
179167

180168
sub t_on_disconnect {
181169
my $redis = shift;
182170

183-
my $on_disconn = $redis->on_disconnect;
184-
is( $on_disconn->(), 2, q{get "on_disconnect" callback} );
171+
is( $redis->on_disconnect->(), 2, q{get "on_disconnect" callback} );
185172

186173
$redis->on_disconnect(undef);
187174
is( $redis->on_disconnect, undef, q{disable "on_disconnect" callback} );
188175

189176
$redis->on_disconnect(
190177
sub {
191-
return 6;
178+
return 5;
192179
}
193180
);
194-
is( $redis->on_disconnect->(), 6, q{set "on_disconnect" callback} );
181+
is( $redis->on_disconnect->(), 5, q{set "on_disconnect" callback} );
195182

196183
return;
197184
}
198185

199186
sub t_on_error {
200187
my $redis = shift;
201188

202-
my $on_error = $redis->on_error;
203-
is( $on_error->(), 3, q{get "on_error" callback} );
189+
is( $redis->on_error->(), 3, q{get "on_error" callback} );
204190

205191
local %SIG;
206192
my $t_err;
@@ -218,11 +204,11 @@ sub t_on_error {
218204

219205
$redis->on_error(
220206
sub {
221-
return 4;
207+
return 6;
222208
}
223209
);
224210

225-
is( $redis->on_error->(), 4, q{set "on_error" callback} );
211+
is( $redis->on_error->(), 6, q{set "on_error" callback} );
226212

227213
return;
228214
}

‎t/03-auth.t‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ use Test::More;
66
use AnyEvent::RipeRedis qw( :err_codes );
77
require 't/test_helper.pl';
88

9-
my $SERVER_INFO = run_redis_instance(
9+
my $server_info = run_redis_instance(
1010
requirepass => 'testpass',
1111
);
12-
if ( !defined $SERVER_INFO ) {
12+
if ( !defined $server_info ) {
1313
plan skip_all => 'redis-server is required for this test';
1414
}
1515
plan tests => 8;
1616

17-
t_successful_auth($SERVER_INFO);
18-
t_invalid_password($SERVER_INFO);
17+
t_successful_auth($server_info);
18+
t_invalid_password($server_info);
1919

2020

2121
sub t_successful_auth {

‎t/04-commands.t‎

Lines changed: 34 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,24 @@ use Test::More;
77
use AnyEvent::RipeRedis qw( :err_codes );
88
require 't/test_helper.pl';
99

10-
my $SERVER_INFO = run_redis_instance();
11-
if ( !defined $SERVER_INFO ) {
10+
my $server_info = run_redis_instance();
11+
if ( !defined $server_info ) {
1212
plan skip_all => 'redis-server is required for this test';
1313
}
1414
plan tests => 33;
1515

16-
my $REDIS;
17-
my $T_IS_CONN = 0;
18-
my $T_IS_DISCONN = 0;
16+
my $T_CONNECTED = 0;
17+
my $T_DISCONNECTED = 0;
18+
19+
my $redis;
1920

2021
ev_loop(
2122
sub {
2223
my $cv = shift;
2324

24-
$REDIS = AnyEvent::RipeRedis->new(
25-
host => $SERVER_INFO->{host},
26-
port => $SERVER_INFO->{port},
25+
$redis = AnyEvent::RipeRedis->new(
26+
host => $server_info->{host},
27+
port => $server_info->{port},
2728
connection_timeout => 5,
2829
read_timeout => 5,
2930
encoding => 'utf8',
@@ -32,37 +33,37 @@ ev_loop(
3233
},
3334

3435
on_connect => sub {
35-
$T_IS_CONN = 1;
36+
$T_CONNECTED = 1;
3637
$cv->send;
3738
},
3839
on_disconnect => sub {
39-
$T_IS_DISCONN = 1;
40+
$T_DISCONNECTED = 1;
4041
},
4142
);
4243
},
4344
);
4445

45-
ok( $T_IS_CONN, 'on_connect' );
46-
47-
t_status_reply($REDIS);
48-
t_numeric_reply($REDIS);
49-
t_bulk_reply($REDIS);
50-
t_set_undef($REDIS);
51-
t_get_undef($REDIS);
52-
t_set_utf8_string($REDIS);
53-
t_get_utf8_string($REDIS);
54-
t_get_non_existent($REDIS);
55-
t_mbulk_reply($REDIS);
56-
t_mbulk_reply_empty_list($REDIS);
57-
t_mbulk_reply_undef($REDIS);
58-
t_nested_mbulk_reply($REDIS);
59-
t_multi_word_command($REDIS);
60-
t_oprn_error($REDIS);
61-
t_default_on_error($REDIS);
62-
t_error_after_exec($REDIS);
63-
t_discard($REDIS);
64-
t_execute($REDIS);
65-
t_quit($REDIS);
46+
ok( $T_CONNECTED, 'on_connect' );
47+
48+
t_status_reply($redis);
49+
t_numeric_reply($redis);
50+
t_bulk_reply($redis);
51+
t_set_undef($redis);
52+
t_get_undef($redis);
53+
t_set_utf8_string($redis);
54+
t_get_utf8_string($redis);
55+
t_get_non_existent($redis);
56+
t_mbulk_reply($redis);
57+
t_mbulk_reply_empty_list($redis);
58+
t_mbulk_reply_undef($redis);
59+
t_nested_mbulk_reply($redis);
60+
t_multi_word_command($redis);
61+
t_oprn_error($redis);
62+
t_default_on_error($redis);
63+
t_error_after_exec($redis);
64+
t_discard($redis);
65+
t_execute($redis);
66+
t_quit($redis);
6667

6768

6869
sub t_status_reply {
@@ -541,7 +542,7 @@ sub t_nested_mbulk_reply {
541542
sub t_multi_word_command {
542543
my $redis = shift;
543544

544-
my $ver = get_redis_version($REDIS);
545+
my $ver = get_redis_version($redis);
545546

546547
SKIP: {
547548
if ( $ver < version->parse( 'v2.6.9' ) ) {
@@ -804,7 +805,7 @@ sub t_quit {
804805
);
805806

806807
is( $t_reply, 'OK', 'QUIT; status reply; disconnect' );
807-
ok( $T_IS_DISCONN, 'on_disconnect' );
808+
ok( $T_DISCONNECTED, 'on_disconnect' );
808809

809810
return;
810811
}

0 commit comments

Comments
 (0)