Index: trunk/Nebulous-Server/t/14_client_lock.t
===================================================================
--- trunk/Nebulous-Server/t/14_client_lock.t	(revision 2872)
+++ trunk/Nebulous-Server/t/14_client_lock.t	(revision 4440)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 14_client_lock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $
+# $Id: 14_client_lock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
 
 use strict;
@@ -14,91 +14,91 @@
 use lib qw( ./t ./lib );
 
-use PS::IPP::IData::Client;
-use PS::IPP::IData::Util qw( :standard );
-use Test::IData;
+use Nebulous::Client;
+use Nebulous::Util qw( :standard );
+use Test::Nebulous;
 
 my $hostport = Apache::Test->config->{ 'hostport' };
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
     # key, type
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    ok( $idata->lock( "foo", "read" ), "read lock" );
-}
-
-Test::IData->setup;
-
-{
-    # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    ok( $idata->lock( "foo", "read", 10 ), "read lock" );
-}
-
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    ok( $idata->lock( "foo", "read" ), "read lock" );
-    ok( $idata->lock( "foo", "read" ), "read lock" );
-}
-
-Test::IData->setup;
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    ok( $neb->lock( "foo", "read" ), "read lock" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, type, timeout
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    ok( $neb->lock( "foo", "read", 10 ), "read lock" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    ok( $neb->lock( "foo", "read" ), "read lock" );
+    ok( $neb->lock( "foo", "read" ), "read lock" );
+}
+
+Test::Nebulous->setup;
 
 {
     # key, type
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    ok( $idata->lock( "foo", "write" ), "write lock" );
-}
-
-Test::IData->setup;
-
-{
-    # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    ok( $idata->lock( "foo", "write", 10 ), "write lock" );
-}
-
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    is( $idata->lock( "foo", "read" ), undef, "storage object does not exist" );
-}
-
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    is( $idata->lock( "foo", "write" ), undef, "storage object does not exist" );
-}
-
-Test::IData->setup;
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    ok( $neb->lock( "foo", "write" ), "write lock" );
+}
+
+Test::Nebulous->setup;
+
+{
+    # key, type, timeout
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    ok( $neb->lock( "foo", "write", 10 ), "write lock" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    is( $neb->lock( "foo", "read" ), undef, "storage object does not exist" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    is( $neb->lock( "foo", "write" ), undef, "storage object does not exist" );
+}
+
+Test::Nebulous->setup;
 
 diag "testing a spinlock, this will be a litle slow...";
@@ -109,11 +109,11 @@
 
     # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "read" );
-    $idata->lock( "foo", "write" );
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "read" );
+    $neb->lock( "foo", "write" );
 
     alarm 0;
@@ -121,5 +121,5 @@
 like( $@, qr/timeout/, "default spinlock" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 diag "testing a spinlock, this will be a litle slow...";
@@ -130,11 +130,11 @@
 
     # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "read" );
-    unless ( $idata->lock( "foo", "write" ) ) {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "read" );
+    unless ( $neb->lock( "foo", "write" ) ) {
         alarm 0;
         die "gaveup";
@@ -145,5 +145,5 @@
 like( $@, qr/gaveup/, "default spinlock" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 diag "testing a spinlock, this will be a litle slow...";
@@ -154,11 +154,11 @@
 
     # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "read" );
-    $idata->lock( "foo", "write", 5 );
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "read" );
+    $neb->lock( "foo", "write", 5 );
 
     alarm 0;
@@ -166,5 +166,5 @@
 like( $@, qr/timeout/, "specified spinlock" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 diag "testing a spinlock, this will be a litle slow...";
@@ -175,11 +175,11 @@
 
     # key, type, timeout
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "read" );
-    unless ( $idata->lock( "foo", "write", 5 ) ) {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "read" );
+    unless ( $neb->lock( "foo", "write", 5 ) ) {
         alarm 0;
         die "gaveup";
@@ -191,83 +191,83 @@
 like( $@, qr/gaveup/, "specified spinlock" );
 
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "write" );
-    is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock twice" );
-}
-
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "read" );
-    is( $idata->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" );
-}
-
-Test::IData->setup;
-
-{
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-    $idata->create( "foo" );
-
-    $idata->lock( "foo", "write" );
-    is( $idata->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" );
-}
-
-Test::IData->setup;
-
-eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    $idata->lock();
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "write" );
+    is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock twice" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "read" );
+    is( $neb->lock( "foo", "write", 1 ), undef, "can not write lock after read lock" );
+}
+
+Test::Nebulous->setup;
+
+{
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+    $neb->create( "foo" );
+
+    $neb->lock( "foo", "write" );
+    is( $neb->lock( "foo", "read", 1 ), undef, "can not read lock after write lock" );
+}
+
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    $neb->lock();
 };
 like( $@, qr/2 - 3 were expected/, "no params" );
 
-Test::IData->setup;
-
-eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    $idata->lock( "foo" );
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    $neb->lock( "foo" );
 };
 like( $@, qr/2 - 3 were expected/, "not enough params" );
 
-Test::IData->setup;
-
-eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    $idata->lock( "foo", "both" );
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    $neb->lock( "foo", "both" );
 };
 like( $@, qr/is read or write/, "not read or write" );
 
-Test::IData->setup;
-
-eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
-    );
-
-    $idata->lock( "foo", 'read', 3, "bar" );
+Test::Nebulous->setup;
+
+eval {
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
+    );
+
+    $neb->lock( "foo", 'read', 3, "bar" );
 };
 like( $@, qr/2 - 3 were expected/, "too many params" );
 
-Test::IData->cleanup;
+Test::Nebulous->cleanup;