Index: trunk/Nebulous-Server/t/07_server_find_instances.t
===================================================================
--- trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 12641)
+++ trunk/Nebulous-Server/t/07_server_find_instances.t	(revision 12643)
@@ -3,10 +3,10 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 07_server_find_instances.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 07_server_find_instances.t,v 1.7 2007-03-28 21:48:24 jhoblitt Exp $
 
 use strict;
 use warnings FATAL => qw( all );
 
-use Test::More tests => 7;
+use Test::More tests => 13;
 
 use lib qw( ./t ./lib );
@@ -14,4 +14,5 @@
 use Nebulous::Server;
 use Nebulous::Util qw( :standard );
+use Test::URI;
 use Test::Nebulous;
 
@@ -26,9 +27,10 @@
 {
     # key
-    my $uri = $neb->create_object( "foo" );
+    my $uri = $neb->create_object("foo");
 
-    my $locations = $neb->find_instances( "foo" );
+    my $locations = $neb->find_instances("foo");
 
-    is( $uri, $locations->[0], "URIs match" );
+    uri_scheme_ok($locations->[0], 'file');
+    is($uri, $locations->[0], "URIs match");
 }
 
@@ -37,10 +39,12 @@
 {
     # key
-    my $uri1 = $neb->create_object( "foo" );
-    my $uri2 = $neb->replicate_object( "foo" );
+    my $uri1 = $neb->create_object("foo");
+    my $uri2 = $neb->replicate_object("foo");
 
-    my $locations = $neb->find_instances( "foo" );
+    my $locations = $neb->find_instances("foo");
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    uri_scheme_ok($locations->[0], 'file');
+    uri_scheme_ok($locations->[1], 'file');
+    ok(eq_set([$uri1, $uri2], $locations), "URIs match");
 }
 
@@ -49,9 +53,10 @@
 {
     # key, volume
-    my $uri = $neb->create_object( "foo" );
+    my $uri = $neb->create_object("foo");
 
-    my $locations = $neb->find_instances( "foo", "node01" );
+    my $locations = $neb->find_instances("foo", "node01");
 
-    is( $uri, $locations->[0], "URIs match" );
+    uri_scheme_ok($locations->[0], 'file');
+    is($uri, $locations->[0], "URIs match");
 }
 
@@ -60,10 +65,12 @@
 {
     # key
-    my $uri1 = $neb->create_object( "foo" );
-    my $uri2 = $neb->replicate_object( "foo" );
+    my $uri1 = $neb->create_object("foo");
+    my $uri2 = $neb->replicate_object("foo");
 
-    my $locations = $neb->find_instances( "foo", "node01" );
+    my $locations = $neb->find_instances("foo", "node01");
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    uri_scheme_ok($locations->[0], 'file');
+    uri_scheme_ok($locations->[1], 'file');
+    ok(eq_set([$uri1, $uri2], $locations), "URIs match");
 }
 
@@ -72,7 +79,7 @@
 
 eval {
-    $neb->find_instances( "foo" );
+    $neb->find_instances("foo");
 };
-like( $@, qr/no instances found/, "storage object does not exist" );
+like($@, qr/no instances found/, "storage object does not exist");
 
 Test::Nebulous->setup;
@@ -81,12 +88,12 @@
     $neb->find_instances();
 };
-like( $@, qr/1 - 2 were expected/, "no params" );
+like($@, qr/1 - 2 were expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->find_instances( "foo", 'read', 3 );
+    $neb->find_instances("foo", 'read', 3);
 };
-like( $@, qr/1 - 2 were expected/, "too many params" );
+like($@, qr/1 - 2 were expected/, "too many params");
 
 Test::Nebulous->cleanup;