Changeset 12960 for trunk/Nebulous-Server/t/03_server_create_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/03_server_create_object.t (modified) (10 diffs)

trunk/Nebulous-Server/t/03_server_create_object.t

@@ -3 +3 @@
 # Copryight (C) 2004-2005  Joshua Hoblitt
 #
-# $Id: 03_server_create_object.t,v 1.11 2006-12-08 03:29:19 jhoblitt Exp $
+# $Id: 03_server_create_object.t,v 1.12 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
-    my $uri = $neb->create_object( "foo" );
+    my $uri = $neb->create_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');
 }
 
@@ -36 +39 @@
 {
     # key, class
-    my $uri = $neb->create_object( "foo", 0 );
+    my $uri = $neb->create_object("foo", 0);
 
-    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');
 }
 
@@ -46 +50 @@
 {
     # key, class, volume
-    my $uri = $neb->create_object( "foo", 0, "node01" );
+    my $uri = $neb->create_object("foo", 0, "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');
 }
 
@@ -56 +61 @@
 {
     # key, class, volume, comment
-    my $uri = $neb->create_object( "foo", 0, "node01", "this is foo" );
+    my $uri = $neb->create_object("foo", 0, "node01", "this is 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');
 }
 
@@ -65 +71 @@
 
 eval {
-    $neb->create_object( "foo" );
-    $neb->create_object( "foo" );
+    $neb->create_object("foo");
+    $neb->create_object("foo");
 };
-like( $@, qr/Duplicate entry/, "object already exists" );
+like($@, qr/Duplicate entry/, "object already exists");
 
 Test::Nebulous->setup;
 
 {
-    my $uri = $neb->create_object( "foo", 1 );
+    my $uri = $neb->create_object("foo", 1);
 
-    ok( -e _get_file_path( $uri ), "class exists" );
+    my ($scheme, $auth, $path, $query, $frag) = uri_split($uri);
+    ok(-e $path, "class exists");
 }
 
@@ -81 +88 @@
 
 eval {
-    $neb->create_object( "foo", 99 );
+    $neb->create_object("foo", 99);
 };
-like( $@, qr/did not pass the \'is valid class id\'/, "class doesn't exist" );
+like($@, qr/did not pass the \'is valid class id\'/, "class doesn't exist");
 
 Test::Nebulous->setup;
 
 eval {
-    $neb->create_object( 1, 0, 'node01', 'x' x 256 );
+    $neb->create_object(1, 0, 'node01', 'x' x 256);
 };
-like( $@, qr/comment length/, "comment is too long" );
+like($@, qr/comment length/, "comment is too long");
 
 Test::Nebulous->setup;
@@ -97 +104 @@
     $neb->create_object();
 };
-like( $@, qr/2 - 4 were expected/, "no params" );
+like($@, qr/2 - 4 were expected/, "no params");
 
 Test::Nebulous->setup;
@@ -104 +111 @@
     $neb->create_object( 1, 0, 'node01', 1, 1 );
 };
-like( $@, qr/2 - 4 were expected/, "too many params" );
+like($@, qr/2 - 4 were expected/, "too many params");
 
 Test::Nebulous->cleanup;