1 files changed, 57 insertions, 25 deletions

diff --git a/t/basic.t b/t/basic.t
index cf0e6a2..102bbab 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -1,54 +1,86 @@
 use strict;
 use warnings;
+
 use Test::More;
 use JSON::XS;
 use Test::Exception;
 use AnyEvent::Riak;
 
-my ($host, $path);
+plan tests => 12;
+
+my ( $host, $path );
+
 BEGIN {
     my $riak_test = $ENV{RIAK_TEST_SERVER};
     ( $host, $path ) = split ";", $riak_test if $riak_test;
     plan skip_all =>
-        'set $ENV{RIAK_TEST_SERVER} like this http://127.0.0.1:8098;jiak if you want to run the tests'
+        'set $ENV{RIAK_TEST_SERVER} if you want to run the tests'
         unless ( $host && $path );
 }
 
-my $jiak = AnyEvent::Riak->new( host => $host, path => $path );
+ok my $riak = AnyEvent::Riak->new( host => $host, path => $path ),
+    'create riak object';
+
+# ping
+ok my $ping_one = $riak->is_alive(
+    sub {
+        pass "is alive";
+	return $_[0];
+    }
+), 'ping with callback';
+
+ok my $ping_two = $riak->is_alive()->recv, 'ping without callback';
+is $ping_two, 'OK', 'valid response from ping without callback';
 
-ok my $buckets = $jiak->list_bucket('bar')->recv, "... fetch bucket list";
-is scalar @{ $buckets->{keys} }, '0', '... no keys';
+ok my $s = $ping_one->recv, 'response from ping without callback';
+is $s, 'OK', 'valid response from ping';
 
+# list bucket
+ok my $bucket_cb = $riak->list_bucket(
+    'bar',
+    sub {
+        my $res = JSON::decode_json(shift);
+        is scalar $res->{keys}, '0', 'no keys';
+    }
+    ),
+    'fetch bucket list';
+
+ok my $buckets = $riak->list_bucket('bar')->recv, "fetch bucket list";
+is scalar @{ $buckets->{keys} }, '0', 'no keys';
+
+$bucket_cb->recv;
+
+# set bucket
 ok my $new_bucket
-    = $jiak->set_bucket( 'foo', { allowed_fields => '*' } )->recv,
-    '... set a new bucket';
+    = $riak->set_bucket( 'foo', { props => { n_val => 2 } } )->recv,
+    'set a new bucket';
 
 my $value = {
     bucket => 'foo',
-    key    => 'bar',
+    key    => 'bar3',
     object => { foo => "bar", baz => 1 },
     links  => []
 };
 
-ok my $res = $jiak->store($value)->recv, '... set a new key';
+ok my $res = $riak->store($value)->recv, '... set a new key';
 
-ok $res = $jiak->fetch( 'foo', 'bar' )->recv, '... fetch our new key';
-ok $res = $jiak->delete( 'foo', 'bar' )->recv, '... delete our key';
+ok $res = $riak->fetch( 'foo', 'bar' )->recv, '... fetch our new key';
+# #ok $res = $riak->delete( 'foo', 'bar' )->recv, '... delete our key';
 
-dies_ok { $jiak->fetch( 'foo', 'foo' )->recv } '... dies when error';
-like $@, qr/404/, '... 404 response';
+# #dies_ok { $riak->fetch( 'foo', 'foo' )->recv } '... dies when error';
+# #like $@, qr/404/, '... 404 response';
 
-ok $res = $jiak->store($value)->recv, '... set a new key';
-my $second_value = {
-    bucket => 'foo',
-    key    => 'baz',
-    object => { foo => "bar", baz => 2 },
-    links  => [ [ 'foo', 'bar', 'tagged' ] ],
-};
-ok $res = $jiak->store($second_value)->recv, '... set another new key';
+# #ok $res = $riak->store($value)->recv, '... set a new key';
+# #my $second_value = {
+#     #bucket => 'foo',
+#     #key    => 'baz',
+#     #object => { foo => "bar", baz => 2 },
+#     #links  => [ [ 'foo', 'bar', 'tagged' ] ],
+# #};
+# #ok $res = $riak->store($second_value)->recv, '... set another new key';
 
-ok $res = $jiak->walk( 'foo', 'baz', [ { bucket => 'foo', } ] )->recv,
-    '... walk';
-is $res->{results}->[0]->[0]->{key}, "bar", "... walked to bar";
+# #ok $res = $riak->walk( 'foo', 'baz', [ { bucket => 'foo', } ] )->recv,
+#     #'... walk';
+# #is $res->{results}->[0]->[0]->{key}, "bar", "... walked to bar";
 
-done_testing();
+# done_testing();