Index: /trunk/Nebulous-Server/t/16_client_find_instances.t
===================================================================
--- /trunk/Nebulous-Server/t/16_client_find_instances.t	(revision 2869)
+++ /trunk/Nebulous-Server/t/16_client_find_instances.t	(revision 2870)
@@ -6,5 +6,5 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 7;
+plan tests => 13;
 
 use lib qw( ./t ./lib );
@@ -18,7 +18,4 @@
 Test::IData->setup;
 
-SKIP: {
-    skip "need to write a module to validate URIs", 7;
-
 {
     # key
@@ -26,9 +23,10 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri = $idata->create( "foo" );
+    $idata->create( "foo" );
 
     my $locations = $idata->find_instances( "foo" );
 
-    is( $uri, @$locations[0], "URIs match" );
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
 }
 
@@ -40,10 +38,12 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri1 = $idata->create( "foo" );
-    my $uri2 = $idata->replicate( "foo" );
+    $idata->create( "foo" );
+    $idata->replicate( "foo" );
 
     my $locations = $idata->find_instances( "foo" );
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    is( scalar @$locations, 2, "found 2" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    like( @$locations[1], qr/file:/, "URIs match" );
 }
 
@@ -55,9 +55,10 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri = $idata->create( "foo" );
+    $idata->create( "foo" );
 
     my $locations = $idata->find_instances( "foo", "node01" );
 
-    is( $uri, $locations->[0], "URIs match" );
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
 }
 
@@ -69,10 +70,12 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri1 = $idata->create( "foo" );
-    my $uri2 = $idata->replicate( "foo" );
+    $idata->create( "foo" );
+    $idata->replicate( "foo" );
 
     my $locations = $idata->find_instances( "foo", "node01" );
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    is( scalar @$locations, 2, "found 2" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    like( @$locations[1], qr/file:/, "URIs match" );
 }
 
@@ -111,4 +114,2 @@
 
 Test::IData->cleanup;
-
-}
Index: /trunk/Nebulous/t/16_client_find_instances.t
===================================================================
--- /trunk/Nebulous/t/16_client_find_instances.t	(revision 2869)
+++ /trunk/Nebulous/t/16_client_find_instances.t	(revision 2870)
@@ -6,5 +6,5 @@
 use Apache::Test qw( -withtestmore );
 
-plan tests => 7;
+plan tests => 13;
 
 use lib qw( ./t ./lib );
@@ -18,7 +18,4 @@
 Test::IData->setup;
 
-SKIP: {
-    skip "need to write a module to validate URIs", 7;
-
 {
     # key
@@ -26,9 +23,10 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri = $idata->create( "foo" );
+    $idata->create( "foo" );
 
     my $locations = $idata->find_instances( "foo" );
 
-    is( $uri, @$locations[0], "URIs match" );
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
 }
 
@@ -40,10 +38,12 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri1 = $idata->create( "foo" );
-    my $uri2 = $idata->replicate( "foo" );
+    $idata->create( "foo" );
+    $idata->replicate( "foo" );
 
     my $locations = $idata->find_instances( "foo" );
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    is( scalar @$locations, 2, "found 2" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    like( @$locations[1], qr/file:/, "URIs match" );
 }
 
@@ -55,9 +55,10 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri = $idata->create( "foo" );
+    $idata->create( "foo" );
 
     my $locations = $idata->find_instances( "foo", "node01" );
 
-    is( $uri, $locations->[0], "URIs match" );
+    is( scalar @$locations, 1, "found 1" );
+    like( @$locations[0], qr/file:/, "URIs match" );
 }
 
@@ -69,10 +70,12 @@
         proxy => "http://$hostport/idata",
     );
-    my $uri1 = $idata->create( "foo" );
-    my $uri2 = $idata->replicate( "foo" );
+    $idata->create( "foo" );
+    $idata->replicate( "foo" );
 
     my $locations = $idata->find_instances( "foo", "node01" );
 
-    ok( eq_set( [$uri1, $uri2], $locations ), "URIs match" );
+    is( scalar @$locations, 2, "found 2" );
+    like( @$locations[0], qr/file:/, "URIs match" );
+    like( @$locations[1], qr/file:/, "URIs match" );
 }
 
@@ -111,4 +114,2 @@
 
 Test::IData->cleanup;
-
-}