[memcached] bradfitz, r340: make everything use mem_get_is

[commits at code.sixapart.com]

make everything use mem_get_is

U   trunk/server/test/delete-window.t
U   trunk/server/test/getset.t
U   trunk/server/test/lib/MemcachedTest.pm


Modified: trunk/server/test/delete-window.t
===================================================================
--- trunk/server/test/delete-window.t	2006-09-04 05:40:50 UTC (rev 339)
+++ trunk/server/test/delete-window.t	2006-09-04 05:45:26 UTC (rev 340)
@@ -27,8 +27,7 @@
 is($line->(), "STORED\r\n", "stored foo");
 print $sock "delete foo 1\r\n";
 is($line->(), "DELETED\r\n", "deleted with 1 second window");
-print $sock "get foo\r\n";
-is($line->(), "END\r\n", "nothing found");
+mem_get_is($sock, "foo", undef);
 print $sock "add foo 0 0 7\r\nfoo-add\r\n";
 is($line->(), "NOT_STORED\r\n", "didn't add foo");
 print $sock "replace foo 0 0 11\r\nfoo-replace\r\n";

Modified: trunk/server/test/getset.t
===================================================================
--- trunk/server/test/getset.t	2006-09-04 05:40:50 UTC (rev 339)
+++ trunk/server/test/getset.t	2006-09-04 05:45:26 UTC (rev 340)
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 
 use strict;
-use Test::More tests => 20;
+use Test::More tests => 14;
 use FindBin qw($Bin);
 use lib "$Bin/lib";
 use MemcachedTest;
@@ -12,26 +12,17 @@
 # set foo (and should get it)
 print $sock "set foo 0 0 6\r\nfooval\r\n";
 is(scalar <$sock>, "STORED\r\n", "stored foo");
-print $sock "get foo\r\n";
-is(scalar <$sock>, "VALUE foo 0 6\r\n", "got FOO value");
-is(scalar <$sock>, "fooval\r\n", "got fooval");
-is(scalar <$sock>, "END\r\n", "got END");
+mem_get_is($sock, "foo", "fooval");
 
 # add bar (and should get it)
 print $sock "add bar 0 0 6\r\nbarval\r\n";
 is(scalar <$sock>, "STORED\r\n", "stored barval");
-print $sock "get bar\r\n";
-is(scalar <$sock>, "VALUE bar 0 6\r\n", "got bar value");
-is(scalar <$sock>, "barval\r\n", "got barval");
-is(scalar <$sock>, "END\r\n", "got END");
+mem_get_is($sock, "bar", "barval");
 
 # add foo (but shouldn't get new value)
 print $sock "add foo 0 0 5\r\nfoov2\r\n";
 is(scalar <$sock>, "NOT_STORED\r\n", "not stored");
-print $sock "get foo\r\n";
-is(scalar <$sock>, "VALUE foo 0 6\r\n", "got FOO value");
-is(scalar <$sock>, "fooval\r\n", "got fooval");
-is(scalar <$sock>, "END\r\n", "got END");
+mem_get_is($sock, "foo", "fooval");
 
 # replace bar (should work)
 print $sock "replace bar 0 0 6\r\nbarva2\r\n";

Modified: trunk/server/test/lib/MemcachedTest.pm
===================================================================
--- trunk/server/test/lib/MemcachedTest.pm	2006-09-04 05:40:50 UTC (rev 339)
+++ trunk/server/test/lib/MemcachedTest.pm	2006-09-04 05:45:26 UTC (rev 340)
@@ -17,6 +17,8 @@
     # works on single-line values only.  no newlines in value.
     my $sock = shift;
     my ($key, $val, $msg) = @_;
+    my $dval = defined $val ? "'$val'" : "<undef>";
+    $msg ||= "$key == $dval";
     print $sock "get $key\r\n";
     if (! defined $val) {
         Test::More::is(scalar <$sock>, "END\r\n", $msg);