Index: trunk/Nebulous-Server/t/13_client_cull.t
===================================================================
--- trunk/Nebulous-Server/t/13_client_cull.t	(revision 2872)
+++ trunk/Nebulous-Server/t/13_client_cull.t	(revision 4440)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 13_client_cull.t,v 1.3 2005-01-03 23:55:29 jhoblitt Exp $
+# $Id: 13_client_cull.t,v 1.4 2005-06-30 02:35:06 jhoblitt Exp $
 
 use strict;
@@ -14,21 +14,21 @@
 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
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->replicate( "foo" );
+    $neb->create( "foo" );
+    $neb->replicate( "foo" );
 
-    my $uri = $idata->cull( "foo" );
+    my $uri = $neb->cull( "foo" );
 
     ok( $uri, "good cull" );
@@ -36,5 +36,5 @@
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 SKIP: {
@@ -42,11 +42,11 @@
 
     # key, $volume
-    my $idata = PS::IPP::IData::Client->new(
-        proxy => "http://$hostport/idata",
+    my $neb = Nebulous::Client->new(
+        proxy => "http://$hostport/nebulous",
     );
-    $idata->create( "foo" );
-    $idata->replicate( "foo", "node01" );
+    $neb->create( "foo" );
+    $neb->replicate( "foo", "node01" );
 
-    my $uri = $idata->cull( "foo", "node01" );
+    my $uri = $neb->cull( "foo", "node01" );
 
     ok( $uri, "good cull" );
@@ -54,18 +54,18 @@
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 {
     # key
-    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" );
 
-    $idata->replicate( "foo", "node01" );
-    $idata->replicate( "foo", "node02" );
+    $neb->replicate( "foo", "node01" );
+    $neb->replicate( "foo", "node02" );
 
-    my $uri1 = $idata->cull( "foo" );
-    my $uri2 = $idata->cull( "foo" );
+    my $uri1 = $neb->cull( "foo" );
+    my $uri2 = $neb->cull( "foo" );
 
     ok( $uri1, "good cull" );
@@ -75,5 +75,5 @@
 }
 
-Test::IData->setup;
+Test::Nebulous->setup;
 
 SKIP: {
@@ -81,14 +81,14 @@
 
     # key, $volume
-    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" );
 
-    $idata->replicate( "foo", "node01" );
-    $idata->replicate( "foo", "node02" );
+    $neb->replicate( "foo", "node01" );
+    $neb->replicate( "foo", "node02" );
 
-    my $uri1 = $idata->cull( "foo", "node01" );
-    my $uri2 = $idata->cull( "foo", "node02" );
+    my $uri1 = $neb->cull( "foo", "node01" );
+    my $uri2 = $neb->cull( "foo", "node02" );
 
     ok( $uri1, "good cull" );
@@ -98,34 +98,34 @@
 }
 
-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",
     );
-    my $uri = $idata->cull( "foo" );
+    my $uri = $neb->cull( "foo" );
 
     is( $uri, undef, "storage object does not exist" );
 }
 
-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->cull();
+    $neb->cull();
 };
 like( $@, qr/1 was 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->cull( 1, 2 );
+    $neb->cull( 1, 2 );
 };
 like( $@, qr/1 was expected/, "too many params" );
 
-Test::IData->cleanup;
+Test::Nebulous->cleanup;