Changeset 20990 for trunk/Nebulous-Server/t/08_server_delete_instance.t

Timestamp:

Dec 14, 2008, 12:54:25 PM (17 years ago)

Author:

eugene

Message:

reverting to pre-distributed version code (distrib is on branch)

File:

• trunk/Nebulous-Server/t/08_server_delete_instance.t (modified) (5 diffs)

trunk/Nebulous-Server/t/08_server_delete_instance.t

@@ -3 +3 @@
 # 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 +24 @@
 
 {
-    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 +32 @@
 
 {
-    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 +52 @@
 
 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 +61 @@
     $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;