===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.10
retrieving revision 1.12
diff -u -r1.10 -r1.12
--- palm/Palm-Keyring/t/keyring5.t	2008/09/18 02:47:37	1.10
+++ palm/Palm-Keyring/t/keyring5.t	2008/09/18 02:51:09	1.12
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring5.t,v 1.9 2007/09/13 15:44:39 andrew Exp $
+# $RedRiver: keyring5.t,v 1.11 2008/09/18 01:50:25 andrew Exp $
 use strict;
 use warnings;
 
@@ -14,6 +14,84 @@
 my $password     = '12345';
 my $new_password = '54321';
 
+my $original_accts = [
+    {   0 => {
+            'label_id' => 0,
+            'data'     => '',
+            'label'    => 'name',
+            'font'     => 0,
+        },
+        2 => {
+            'label_id' => 2,
+            'data'     => 'only password is set',
+            'label'    => 'password',
+            'font'     => 0,
+        },
+        3 => {
+            'label_id' => 3,
+            'data'     => {
+                'month' => 1,
+                'day'   => 1,
+                'year'  => 107
+            },
+            'label' => 'lastchange',
+            'font'  => 0,
+        }
+    },
+    {   0 => {
+            'label_id' => 0,
+            'data'     => 'test',
+            'label'    => 'name',
+            'font'     => 0,
+        },
+        2 => {
+            'label_id' => 2,
+            'data'     => 'abcd1234',
+            'label'    => 'password',
+            'font'     => 0,
+        },
+        3 => {
+            'label_id' => 3,
+            'data'     => {
+                'month' => 1,
+                'day'   => 11,
+                'year'  => 107
+            },
+            'label' => 'lastchange',
+            'font'  => 0,
+        },
+        255 => {
+            'label_id' => 255,
+            'data'     => 'This is a short note.',
+            'label'    => 'notes',
+            'font'     => 0,
+        }
+    },
+    {   0 => {
+            'label_id' => 0,
+            'data'     => '',
+            'label'    => 'name',
+            'font'     => 0,
+        },
+        2 => {
+            'label_id' => 2,
+            'data'     => 'password (date is 2/2/07)',
+            'label'    => 'password',
+            'font'     => 0,
+        },
+        3 => {
+            'label_id' => 3,
+            'data'     => {
+                'month' => 1,
+                'day'   => 2,
+                'year'  => 107
+            },
+            'label' => 'lastchange',
+            'font'  => 0,
+        }
+    }
+];
+
 foreach my $cipher ( 0 .. 3 ) {
 
     #next unless $cipher == 0;
@@ -29,84 +107,6 @@
         password => $password,
         cipher   => $cipher,
     };
-
-    my $original_accts = [
-        {   0 => {
-                'label_id' => 0,
-                'data'     => '',
-                'label'    => 'name',
-                'font'     => 0,
-            },
-            2 => {
-                'label_id' => 2,
-                'data'     => 'only password is set',
-                'label'    => 'password',
-                'font'     => 0,
-            },
-            3 => {
-                'label_id' => 3,
-                'data'     => {
-                    'month' => 1,
-                    'day'   => 1,
-                    'year'  => 107
-                },
-                'label' => 'lastchange',
-                'font'  => 0,
-            }
-        },
-        {   0 => {
-                'label_id' => 0,
-                'data'     => 'test',
-                'label'    => 'name',
-                'font'     => 0,
-            },
-            2 => {
-                'label_id' => 2,
-                'data'     => 'abcd1234',
-                'label'    => 'password',
-                'font'     => 0,
-            },
-            3 => {
-                'label_id' => 3,
-                'data'     => {
-                    'month' => 1,
-                    'day'   => 11,
-                    'year'  => 107
-                },
-                'label' => 'lastchange',
-                'font'  => 0,
-            },
-            255 => {
-                'label_id' => 255,
-                'data'     => 'This is a short note.',
-                'label'    => 'notes',
-                'font'     => 0,
-            }
-        },
-        {   0 => {
-                'label_id' => 0,
-                'data'     => '',
-                'label'    => 'name',
-                'font'     => 0,
-            },
-            2 => {
-                'label_id' => 2,
-                'data'     => 'password (date is 2/2/07)',
-                'label'    => 'password',
-                'font'     => 0,
-            },
-            3 => {
-                'label_id' => 3,
-                'data'     => {
-                    'month' => 1,
-                    'day'   => 2,
-                    'year'  => 107
-                },
-                'label' => 'lastchange',
-                'font'  => 0,
-            }
-        }
-    ];
 
     my $Num_Tests_Left = 34;
 SKIP: {