===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/t/network_tests.t,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HOPE/Net-OpenAMD/t/network_tests.t	2010/07/13 07:10:31	1.12
+++ HOPE/Net-OpenAMD/t/network_tests.t	2010/07/14 02:54:03	1.13
@@ -1,7 +1,7 @@
 #!perl
 package NetworkTests;
 
-# $AFresh1: network_tests.t,v 1.11 2010/07/13 03:37:47 andrew Exp $
+# $AFresh1: network_tests.t,v 1.12 2010/07/13 06:10:31 andrew Exp $
 
 use strict;
 use warnings;
@@ -60,12 +60,14 @@
 
     $cmp{user} = [
         $cmp{single_line},
-        {   name => $cmp{single_line},
+        superhashof(
+            {   name => $cmp{single_line},
 
-            #interests => array_each( $cmp{interests} ),
-            #x         => $cmp{coordinate},
-            #y         => $cmp{coordinate},
-        }
+                #interests => array_each( $cmp{interests} ),
+                #x         => $cmp{coordinate},
+                #y         => $cmp{coordinate},
+            }
+        ),
     ];
 
     $cmp{speaker} = [
@@ -75,23 +77,27 @@
         }
     ];
 
+    $cmp{location} = superhashof(
+        {   area => $cmp{area},
+            user => $cmp{digits},
+
+            #button => $cmp{boolean},
+            x => $cmp{coordinate},
+            y => $cmp{coordinate},
+
+            #time   => $cmp{single_line},
+        }
+    );
+
     my %tests = (
         location => [
             {   args   => undef,
-                expect => array_each(
-                    {   area   => $cmp{area},
-                        user   => $cmp{digits},
-                        button => $cmp{boolean},
-                        x      => $cmp{coordinate},
-                        y      => $cmp{coordinate},
-                        time   => $cmp{single_line},
-                    }
-                ),
+                expect => array_each( $cmp{location} ),
             },
             {   args   => { user => 'user0' },
                 expect => array_each(),
             },
-            {   args   => { user => 'user0', limit => 20 },
+            {   args   => { user => 'user0', limit => 5 },
                 expect => array_each(),
             },
             {   args   => { area => 'Engressa' },