X-Git-Url: http://git.rot13.org/?p=perl-Redis.git;a=blobdiff_plain;f=t%2F01-Redis.t;h=cc8d95b2c6776172d0e584d596bdfa87144cffb9;hp=b12e727cf0a44e2da94bd00a9371e6bf01e8507e;hb=9d787cbf91248981f136b6319b5d5b86e6ec6d7a;hpb=776f1916034f293af03303fb23d65c04c62ec352;ds=sidebyside

diff --git a/t/01-Redis.t b/t/01-Redis.t
index b12e727..cc8d95b 100755
--- a/t/01-Redis.t
+++ b/t/01-Redis.t
@@ -3,7 +3,8 @@
 use warnings;
 use strict;
 
-use Test::More tests => 103;
+use Test::More tests => 108;
+use Data::Dump qw/dump/;
 
 use lib 'lib';
 
@@ -15,13 +16,13 @@ ok( my $o = Redis->new(), 'new' );
 
 ok( $o->ping, 'ping' );
 
+ok( $o = Redis->new( server => 'localhost:6379' ), 'new with server' );
 
 diag "Commands operating on string values";
 
 ok( $o->set( foo => 'bar' ), 'set foo => bar' );
 
-eval { $o->set( foo => 'bar', 1 ) };
-ok( $@, 'set foo => bar new again failed' );
+ok( ! $o->setnx( foo => 'bar' ), 'setnx foo => bar fails' );
 
 cmp_ok( $o->get( 'foo' ), 'eq', 'bar', 'get foo = bar' );
 
@@ -32,7 +33,6 @@ cmp_ok( $o->get( 'foo' ), 'eq', 'baz', 'get foo = baz' );
 ok( $o->set( 'test-undef' => 42 ), 'set test-undef' );
 ok( $o->set( 'test-undef' => undef ), 'set undef' );
 ok( ! defined $o->get( 'test-undef' ), 'get undef' );
-diag $o->exists( 'test-undef' );
 ok( $o->exists( 'test-undef' ), 'exists undef' );
 
 $o->del('non-existant');
@@ -50,14 +50,14 @@ is_deeply( [ $o->mget( 'foo', 'key-next', 'key-left' ) ], [ 'baz', 0, 3 ], 'mget
 
 my @keys;
 
-foreach ( 0 .. $key_next ) {
-	my $key = 'key-' . $_;
+foreach my $id ( 0 .. $key_next ) {
+	my $key = 'key-' . $id;
 	push @keys, $key;
-	ok(     $o->set( $key => $_ ),           "set $key" );
+	ok(     $o->set( $key => $id ),           "set $key" );
 	ok(  $o->exists( $key       ),           "exists $key" );
-	cmp_ok( $o->get( $key       ), 'eq', $_, "get $key" );
-	cmp_ok( $o->incr( 'key-next' ), '==', $_ + 1, 'incr' );
-	cmp_ok( $o->decr( 'key-left' ), '==', $key_next - $_ - 1, 'decr' );
+	cmp_ok( $o->get( $key       ), 'eq', $id, "get $key" );
+	cmp_ok( $o->incr( 'key-next' ), '==', $id + 1, 'incr' );
+	cmp_ok( $o->decr( 'key-left' ), '==', $key_next - $id - 1, 'decr' );
 }
 
 cmp_ok( $o->get( 'key-next' ), '==', $key_next + 1, 'key-next' );
@@ -65,8 +65,8 @@ cmp_ok( $o->get( 'key-next' ), '==', $key_next + 1, 'key-next' );
 ok( $o->set('test-incrby', 0), 'test-incrby' );
 ok( $o->set('test-decrby', 0), 'test-decry' );
 foreach ( 1 .. 3 ) {
-	cmp_ok( $o->incr('test-incrby', 3), '==', $_ * 3, 'incrby 3' );
-	cmp_ok( $o->decr('test-decrby', 7), '==', -( $_ * 7 ), 'decrby 7' );
+	cmp_ok( $o->incrby('test-incrby', 3), '==', $_ * 3, 'incrby 3' );
+	cmp_ok( $o->decrby('test-decrby', 7), '==', -( $_ * 7 ), 'decrby 7' );
 }
 
 ok( $o->del( $_ ), "del $_" ) foreach map { "key-$_" } ( 'next', 'left' );
@@ -139,7 +139,7 @@ cmp_ok( $o->scard( $set ), '==', 0, 'scard' );
 $o->sadd( 'test-set1', $_ ) foreach ( 'foo', 'bar', 'baz' );
 $o->sadd( 'test-set2', $_ ) foreach ( 'foo', 'baz', 'xxx' );
 
-my $inter = [ 'baz', 'foo' ];
+my $inter = [ 'foo', 'baz' ];
 
 is_deeply( [ $o->sinter( 'test-set1', 'test-set2' ) ], $inter, 'siter' );
 
@@ -175,7 +175,16 @@ is_deeply( [ $o->sort( 'test-sort DESC' ) ], [ 4,3,2,1 ], 'sort DESC' );
 diag "Persistence control commands";
 
 ok( $o->save, 'save' );
+ok( $o->bgsave, 'bgsave' );
+ok( $o->lastsave, 'lastsave' );
+#ok( $o->shutdown, 'shutdown' );
+diag "shutdown not tested";
 
+diag "Remote server control commands";
+
+ok( my $info = $o->info, 'info' );
+isa_ok( $info, 'HASH' );
+diag dump( $info );
 
 diag "Connection handling";