===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/t/network_tests.t,v
retrieving revision 1.9
retrieving revision 1.11
diff -u -r1.9 -r1.11
--- HOPE/Net-OpenAMD/t/network_tests.t	2010/07/13 03:27:06	1.9
+++ HOPE/Net-OpenAMD/t/network_tests.t	2010/07/13 04:37:47	1.11
@@ -1,7 +1,7 @@
 #!perl
 package NetworkTests;
 
-# $AFresh1: network_tests.t,v 1.8 2010/07/13 00:14:43 andrew Exp $
+# $AFresh1: network_tests.t,v 1.10 2010/07/13 03:23:48 andrew Exp $
 
 use strict;
 use warnings;
@@ -9,8 +9,9 @@
 use Test::More;
 use Test::Deep;
 use Net::OpenAMD;
-use Data::Dumper;
 
+#use Data::Dumper;
+
 if ( !caller() ) {
     if ( $ENV{'NETWORK_TESTS'} ) {
         plan tests => 13;
@@ -47,7 +48,7 @@
     );
     my %cmp = (
         single_line   => re('^[^\n]+$'),
-        multi_line    => re('^.*$'),
+        multi_line    => re('(?xms:^.*$)'),
         digits        => re('^\d+$'),
         track         => any( 'Lovelace', 'Tesla', 'Bell', 'Hooper' ),
         area          => any('Engressia'),
@@ -57,8 +58,23 @@
         boolean => any( 'True', 'False' ),
     );
 
-    #$cmp{speaker} = $cmp{single_line};
+    $cmp{user} = [
+        $cmp{single_line},
+        {   name => $cmp{single_line},
 
+            #interests => array_each( $cmp{interests} ),
+            #x         => $cmp{coordinate},
+            #y         => $cmp{coordinate},
+        }
+    ];
+
+    $cmp{speaker} = [
+        $cmp{single_line},
+        {   name => $cmp{single_line},
+            bio  => $cmp{multi_line},
+        }
+    ];
+
     my %tests = (
         location => [
             {   args   => undef,
@@ -72,31 +88,47 @@
                     }
                 ),
             },
-            { args => { user => 'user0' },
-                    expect => array_each(),
+            {   args   => { user => 'user0' },
+                expect => array_each(),
             },
+            {   args   => { user => 'user0', limit => 20 },
+                expect => array_each(),
+            },
+            {   args   => { area => 'Engressa' },
+                expect => array_each(),
+            },
         ],
         speakers => [
             {   args   => undef,
-                expect => array_each(
-                    {   name => $cmp{single_line},
-                        bio  => $cmp{multi_line},
-                    }
-                ),
+                expect => array_each( $cmp{speaker} ),
             },
+            {   args => { name => 'The Cheshire Catalyst' },
+                expect => array_each( $cmp{speaker} ),
+            },
         ],
         talks => [
             {   args   => undef,
                 expect => array_each(
-                    {   abstract  => $cmp{single_line},
-                        interests => array_each( $cmp{interests} ),
-                        speakers  => array_each( $cmp{single_line} ),
-                        time      => $cmp{single_line},
-                        title     => $cmp{multi_line},
-                        track     => $cmp{track},
+                    {   abstract => $cmp{multi_line},
+                        speakers => array_each( $cmp{single_line} ),
+                        time     => $cmp{single_line},
+                        title    => $cmp{single_line},
+                        track    => $cmp{track},
                     }
                 ),
             },
+            {   args   => { interests => 'lockpicking' },
+                expect => array_each(
+                    {   abstract => $cmp{multi_line},
+                        speakers => array_each( $cmp{single_line} ),
+                        time     => $cmp{single_line},
+                        title    => $cmp{single_line},
+                        track    => $cmp{track},
+
+                        # interests => 'lockpicking',
+                    }
+                ),
+            },
         ],
         interests => [
             {   args   => undef,
@@ -105,13 +137,16 @@
         ],
         users => [
             {   args   => undef,
-                expect => array_each(
-                    {   interests => array_each( $cmp{interests} ),
-                        name      => $cmp{single_line},
-                        x         => $cmp{coordinate},
-                        y         => $cmp{coordinate},
-                    }
-                ),
+                expect => array_each( $cmp{user} ),
+            },
+            {   args   => { user => 'user0' },
+                expect => array_each( $cmp{user} ),
+            },
+            {   args   => { user => 'user0', limit => 20 },
+                expect => array_each( $cmp{user} ),
+            },
+            {   args   => { interests => 'lockpicking' },
+                expect => array_each( $cmp{user} ),
             },
         ],
         stats => [