===================================================================
RCS file: /cvs/HOPE/Net-OpenAMD/t/network_tests.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- 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:23:48	1.10
@@ -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.9 2010/07/13 02:27:06 andrew Exp $
 
 use strict;
 use warnings;
@@ -47,7 +47,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'),
@@ -72,28 +72,29 @@
                     }
                 ),
             },
-            { args => { user => 'user0' },
-                    expect => array_each(),
+            {   args   => { user => 'user0' },
+                expect => array_each(),
             },
         ],
         speakers => [
             {   args   => undef,
                 expect => array_each(
-                    {   name => $cmp{single_line},
-                        bio  => $cmp{multi_line},
-                    }
+                    [   $cmp{single_line},
+                        {   name => $cmp{single_line},
+                            bio  => $cmp{multi_line},
+                        }
+                    ]
                 ),
             },
         ],
         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},
                     }
                 ),
             },
@@ -106,10 +107,12 @@
         users => [
             {   args   => undef,
                 expect => array_each(
-                    {   interests => array_each( $cmp{interests} ),
-                        name      => $cmp{single_line},
-                        x         => $cmp{coordinate},
-                        y         => $cmp{coordinate},
+                    $cmp{single_line},
+                    {   name => $cmp{single_line},
+
+                        #interests => array_each( $cmp{interests} ),
+                        #x         => $cmp{coordinate},
+                        #y         => $cmp{coordinate},
                     }
                 ),
             },