Index: trunk/Nebulous-Server/t/02_server_setup.t
===================================================================
--- trunk/Nebulous-Server/t/02_server_setup.t	(revision 20965)
+++ trunk/Nebulous-Server/t/02_server_setup.t	(revision 20990)
@@ -3,10 +3,10 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 02_server_setup.t,v 1.7 2008-12-12 21:13:41 jhoblitt Exp $
+# $Id: 02_server_setup.t,v 1.8 2008-12-14 22:54:25 eugene Exp $
 
 use strict;
 use warnings;
 
-use Test::More tests => 6;
+use Test::More tests => 2;
 
 use lib qw( ./t ./lib );
@@ -17,49 +17,23 @@
 Test::Nebulous->setup;
 
-isa_ok(Nebulous::Server->new(), "Nebulous::Server");
+isa_ok(
+    Nebulous::Server->new(
+        dsn         => $NEB_DB,
+        dbuser      => $NEB_USER,
+        dbpasswd    => $NEB_PASS,
+    ),
+    "Nebulous::Server"
+);
 
 Test::Nebulous->setup;
 
-# ->new()
-{
-    my $neb = Nebulous::Server->new( log_level => 'off' );
-
-    ok($neb, "set log level");
-}
-
-Test::Nebulous->setup;
-
-{
-    my $neb = Nebulous::Server->new(
+eval {
+    Nebulous::Server->new(
         dsn         => "DBI:mysql:database=foobar:host=localhost",
         dbuser      => "baz",
         dbpasswd    =>"boo",
     );
-
-    ok($neb, "set database");
-}
-
-Test::Nebulous->setup;
-
-# add dbs after ->new()
-{
-    my $neb = Nebulous::Server->new;
-
-    ok($neb->config->add_db(
-        dbindex    => 0,
-        dsn         => "DBI:mysql:database=foobar:host=localhost",
-        dbuser      => "baz",
-        dbpasswd    =>"boo",
-    ), "add db");
-    
-    ok($neb->config->add_db(
-        dbindex    => 1,
-        dsn         => "DBI:mysql:database=foobar:host=localhost",
-        dbuser      => "baz",
-        dbpasswd    =>"boo",
-    ), "add dbs");
-
-    is($neb->config->n_db, 2, "n dbs")
-}
+};
+like( $@, qr/DBI connect.*? failed/, "bad dsn/user/pass" );
 
 Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/08_server_delete_instance.t
===================================================================
--- trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 20965)
+++ trunk/Nebulous-Server/t/08_server_delete_instance.t	(revision 20990)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 08_server_delete_instance.t,v 1.11 2008-12-12 21:13:41 jhoblitt Exp $
+# $Id: 08_server_delete_instance.t,v 1.12 2008-12-14 22:54:25 eugene Exp $
 
 use strict;
@@ -24,8 +24,7 @@
 
 {
-    my $key = "foo";
-    my $uri = $neb->create_object($key);
+    my $uri = $neb->create_object("foo");
 
-    ok($neb->delete_instance($key, $uri), "delete instance");
+    ok($neb->delete_instance($uri), "delete instance");
 }
 
@@ -33,18 +32,17 @@
 
 {
-    my $key = "foo";
-    my $uri1 = $neb->create_object($key);
-    my $uri2 = $neb->replicate_object($key);
+    my $uri1 = $neb->create_object("foo");
+    my $uri2 = $neb->replicate_object("foo");
 
-    ok($neb->delete_instance($key, $uri1), "delete instance");
+    ok($neb->delete_instance($uri1), "delete instance");
 
-    my $locations = $neb->find_instances($key);
+    my $locations = $neb->find_instances("foo");
 
     is($locations->[0], $uri2, "instance remains");
 
-    ok($neb->delete_instance($key, $uri2), "delete instance");
+    ok($neb->delete_instance( $uri2 ), "delete instance");
 
     eval {
-        $neb->find_instances($key);
+        $neb->find_instances("foo");
     };
     like($@, qr/is valid object key/, "storage object was deleted");
@@ -54,8 +52,5 @@
 
 eval {
-    my $key = "foo";
-    my $uri1 = $neb->create_object($key);
-
-    $neb->delete_instance($key, "file:/foo");
+    $neb->delete_instance("file:/foo");
 };
 like($@, qr/no instance is associated with uri/, "uri does not exist");
@@ -66,15 +61,12 @@
     $neb->delete_instance();
 };
-like($@, qr/2 were expected/, "no params");
+like($@, qr/1 was expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    my $key = "foo";
-    my $uri1 = $neb->create_object($key);
-
-    $neb->delete_instance("foo", 2, 3);
+    $neb->delete_instance("foo", 2);
 };
-like($@, qr/2 were expected/, "too many params");
+like($@, qr/1 was expected/, "too many params");
 
 Test::Nebulous->cleanup;
Index: trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t
===================================================================
--- trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 20965)
+++ trunk/Nebulous-Server/t/10_server_is_valid_volume_name.t	(revision 20990)
@@ -3,5 +3,5 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 10_server_is_valid_volume_name.t,v 1.6 2008-12-12 21:13:41 jhoblitt Exp $
+# $Id: 10_server_is_valid_volume_name.t,v 1.7 2008-12-14 22:54:25 eugene Exp $
 
 use strict;
@@ -23,13 +23,13 @@
 Test::Nebulous->setup;
 
-ok($neb->_is_valid_volume_name('foo', 'node01'), "valid volume name");
+ok($neb->_is_valid_volume_name('node01'), "valid volume name");
 
 Test::Nebulous->setup;
 
-ok($neb->_is_valid_volume_name('foo', 'node02'), "valid volume name");
+ok($neb->_is_valid_volume_name('node02'), "valid volume name");
 
 Test::Nebulous->setup;
 
-is($neb->_is_valid_volume_name('foo', 'node99'), undef, "invalid volume name");
+is($neb->_is_valid_volume_name('node99'), undef, "invalid volume name");
 
 Test::Nebulous->cleanup;