--- t/01-Redis.t	2009/03/22 17:02:46	30
+++ t/01-Redis.t	2009/03/23 11:40:50	50
@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 80;
+use Test::More tests => 106;
 
 use lib 'lib';
 
@@ -15,6 +15,9 @@
 
 ok( $o->ping, 'ping' );
 
+
+diag "Commands operating on string values";
+
 ok( $o->set( foo => 'bar' ), 'set foo => bar' );
 
 eval { $o->set( foo => 'bar', 1 ) };
@@ -29,7 +32,6 @@
 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');
@@ -43,6 +45,8 @@
 
 ok( $o->set('key-left' => $key_next), 'key-left' );
 
+is_deeply( [ $o->mget( 'foo', 'key-next', 'key-left' ) ], [ 'baz', 0, 3 ], 'mget' );
+
 my @keys;
 
 foreach ( 0 .. $key_next ) {
@@ -73,7 +77,6 @@
 is_deeply( [ $o->keys('key-*') ], [ @keys ], 'keys' );
 
 ok( my $key = $o->randomkey, 'randomkey' );
-diag "key: $key";
 
 ok( $o->rename( 'test-incrby', 'test-renamed' ), 'rename' );
 ok( $o->exists( 'test-renamed' ), 'exists test-renamed' );
@@ -82,7 +85,7 @@
 ok( $@, 'rename to existing key' );
 
 ok( my $nr_keys = $o->dbsize, 'dbsize' );
-diag "dbsize: $nr_keys";
+
 
 diag "Commands operating on lists";
 
@@ -115,17 +118,66 @@
 
 ok( ! $o->rpop( $list ), 'rpop' );
 
-# Commands operating on sets
+
+diag "Commands operating on sets";
 
 my $set = 'test-set';
 $o->del($set);
 
 ok( $o->sadd( $set, 'foo' ), 'sadd' );
 ok( ! $o->sadd( $set, 'foo' ), 'sadd' );
+cmp_ok( $o->scard( $set ), '==', 1, 'scard' );
+ok( $o->sismember( $set, 'foo' ), 'sismember' );
 
 cmp_ok( $o->type( $set ), 'eq', 'set', 'type is set' );
 
 ok( $o->srem( $set, 'foo' ), 'srem' );
 ok( ! $o->srem( $set, 'foo' ), 'srem again' );
+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' ];
+
+is_deeply( [ $o->sinter( 'test-set1', 'test-set2' ) ], $inter, 'siter' );
+
+ok( $o->sinterstore( 'test-set-inter', 'test-set1', 'test-set2' ), 'sinterstore' );
+
+cmp_ok( $o->scard( 'test-set-inter' ), '==', $#$inter + 1, 'cardinality of intersection' );
+
+
+diag "Multiple databases handling commands";
+
+ok( $o->select( 1 ), 'select' );
+ok( $o->select( 0 ), 'select' );
+
+ok( $o->move( 'foo', 1 ), 'move' );
+ok( ! $o->exists( 'foo' ), 'gone' );
+
+ok( $o->select( 1 ), 'select' );
+ok( $o->exists( 'foo' ), 'exists' );
+
+ok( $o->flushdb, 'flushdb' );
+cmp_ok( $o->dbsize, '==', 0, 'empty' );
+
+
+diag "Sorting";
+
+ok( $o->lpush( 'test-sort', $_ ), "put $_" ) foreach ( 1 .. 4 );
+cmp_ok( $o->llen( 'test-sort' ), '==', 4, 'llen' );
+
+is_deeply( [ $o->sort( 'test-sort' )      ], [ 1,2,3,4 ], 'sort' );
+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 "Connection handling";
 
 ok( $o->quit, 'quit' );