Changeset 12960 for trunk/Nebulous-Server/t/04_server_replicate_object.t

Timestamp:

Apr 23, 2007, 10:42:29 AM (19 years ago)

Author:

jhoblitt

Message:

ws
add the use of Test::URI in tests

File:

• trunk/Nebulous-Server/t/04_server_replicate_object.t (modified) (7 diffs)

trunk/Nebulous-Server/t/04_server_replicate_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 04_server_replicate_object.t,v 1.6 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 04_server_replicate_object.t,v 1.7 2007-04-23 20:42:29 jhoblitt Exp $
 
 use strict;
@@ -15 +15 @@
 use Nebulous::Util qw( :standard );
 use Test::Nebulous;
+use Test::URI;
+use URI::Split qw( uri_split );
 
 my $neb = Nebulous::Server->new(
@@ -26 +28 @@
 {
     # key
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -37 +40 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri = $neb->replicate_object( "foo", "node01" );
+    $neb->create_object("foo");
+    my $uri = $neb->replicate_object("foo", "node01");
 
-    ok( -e _get_file_path( $uri ), "file exists" );
-    like( $uri, qr/^file:\//, "valid URI" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "file exists");
+    uri_scheme_ok($uri, 'file');
 }
 
@@ -48 +52 @@
 {
     # key, $volume
-    $neb->create_object( "foo" );
-    my $uri1 = $neb->replicate_object( "foo", "node01" );
-    my $uri2 = $neb->replicate_object( "foo", "node02" );
+    $neb->create_object("foo");
+    my $uri1 = $neb->replicate_object("foo", "node01");
+    my $uri2 = $neb->replicate_object("foo", "node02");
 
-    ok( -e _get_file_path( $uri1 ), "file exists" );
-    ok( -e _get_file_path( $uri2 ), "file exists" );
-    like( $uri1, qr/^file:\//, "valid URI" );
-    like( $uri2, qr/^file:\//, "valid URI" );
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri1);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri1, 'file');
+    }
+
+    {
+        my ($scheme, $auth, $path, $query, $frag) = uri_split($uri2);
+        ok(-e $path, "file exists");
+        uri_scheme_ok($uri2, 'file');
+    }
 }
 
@@ -61 +72 @@
 
 eval {
-    $neb->replicate_object( "foo" );
+    $neb->replicate_object("foo");
 };
-like( $@, qr/storage object does not exist/, "storage object does not exist" );
+like($@, qr/storage object does not exist/, "storage object does not exist");
 
 Test::Nebulous->setup;
@@ -70 +81 @@
     $neb->replicate_object();
 };
-like( $@, qr/1 - 2 were expected/, "no params" );
+like($@, qr/1 - 2 were expected/, "no params");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->replicate_object( 1, 2, 3 );
+    $neb->replicate_object(1, 2, 3);
 };
-like( $@, qr/1 - 2 were expected/, "too many params" );
+like($@, qr/1 - 2 were expected/, "too many params");
 
 Test::Nebulous->cleanup;