Index: trunk/Nebulous-Server/t/15_client_unlock.t
===================================================================
--- trunk/Nebulous-Server/t/15_client_unlock.t	(revision 2872)
+++ trunk/Nebulous-Server/t/15_client_unlock.t	(revision 4440)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 15_client_unlock.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $
+# $Id: 15_client_unlock.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
 
 use strict;
@@ -14,157 +14,157 @@
 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;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->lock( "foo", "read" );
+    $neb->create( "foo" );
+    $neb->lock( "foo", "read" );
 
-    ok( $idata->unlock( "foo", "read" ), "read unlock" );
+    ok( $neb->unlock( "foo", "read" ), "read unlock" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->lock( "foo", "read" );
-    $idata->lock( "foo", "read" );
+    $neb->create( "foo" );
+    $neb->lock( "foo", "read" );
+    $neb->lock( "foo", "read" );
 
-    ok( $idata->unlock( "foo", "read" ), "read unlock" );
-    ok( $idata->unlock( "foo", "read" ), "read unlock" );
+    ok( $neb->unlock( "foo", "read" ), "read unlock" );
+    ok( $neb->unlock( "foo", "read" ), "read unlock" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->lock( "foo", "write" );
+    $neb->create( "foo" );
+    $neb->lock( "foo", "write" );
 
-    ok( $idata->unlock( "foo", "write" ), "write unlock" );
+    ok( $neb->unlock( "foo", "write" ), "write unlock" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    is( $idata->unlock( "foo", "read" ), undef, "storage object does not exist" );
+    is( $neb->unlock( "foo", "read" ), undef, "storage object does not exist" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    is( $idata->unlock( "foo", "write" ), undef, "storage object does not exist" );
+    is( $neb->unlock( "foo", "write" ), undef, "storage object does not exist" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
+    $neb->create( "foo" );
 
-    is( $idata->unlock( "foo", "read" ), undef, "no lock set" );
+    is( $neb->unlock( "foo", "read" ), undef, "no lock set" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
+    $neb->create( "foo" );
 
-    is( $idata->unlock( "foo", "write" ), undef, "no lock set" );
+    is( $neb->unlock( "foo", "write" ), undef, "no lock set" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->lock( "foo", "write" );
+    $neb->create( "foo" );
+    $neb->lock( "foo", "write" );
 
-    is( $idata->unlock( "foo", "read" ), undef, "read unlock under write lock" );
+    is( $neb->unlock( "foo", "read" ), undef, "read unlock under write lock" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->lock( "foo", "read" );
+    $neb->create( "foo" );
+    $neb->lock( "foo", "read" );
 
-    is( $idata->unlock( "foo", "write" ), undef, "write unlock under read lock" );
+    is( $neb->unlock( "foo", "write" ), undef, "write unlock under read lock" );
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    $idata->unlock();
+    $neb->unlock();
 };
 like( $@, qr/2 were expected/, "no params" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    $idata->unlock( "foo" );
+    $neb->unlock( "foo" );
 };
 like( $@, qr/2 were expected/, "not enough params" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    $idata->unlock( "foo", "both" );
+    $neb->unlock( "foo", "both" );
 };
 like( $@, qr/is read or write/, "not read or write" );
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 eval {
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
 
-    $idata->unlock( "foo", 'read', 3 );
+    $neb->unlock( "foo", 'read', 3 );
 };
 like( $@, qr/2 were expected/, "too many params" );
 
-Test::IData->cleanup;
+Test::Nebulous->cleanup;