===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- palm/Palm-Keyring/t/keyring5.t	2007/09/13 16:44:39	1.9
+++ palm/Palm-Keyring/t/keyring5.t	2008/09/18 02:47:37	1.10
@@ -1,21 +1,22 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring5.t,v 1.8 2007/09/12 02:44:36 andrew Exp $
+# $RedRiver: keyring5.t,v 1.9 2007/09/13 15:44:39 andrew Exp $
 use strict;
 use warnings;
 
 use Test::More tests => 138;
 
-BEGIN { 
-    use_ok( 'Palm::PDB' ); 
-    use_ok( 'Palm::Keyring' ); 
+BEGIN {
+    use_ok('Palm::PDB');
+    use_ok('Palm::Keyring');
 }
 
-my $file = 'Keys-test.pdb';
-my $password = '12345';
+my $file         = 'Keys-test.pdb';
+my $password     = '12345';
 my $new_password = '54321';
 
-foreach my $cipher (0..3) {
-#next unless $cipher == 0;
+foreach my $cipher ( 0 .. 3 ) {
+
+    #next unless $cipher == 0;
     my $pdb;
     my @recs;
     my $record;
@@ -30,106 +31,105 @@
     };
 
     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
+        {   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,
+            }
         },
-        '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
+        {   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,
+            }
         },
-        '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,
-    }
-    }
+        {   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: {
-        if ($cipher > 0) {
+SKIP: {
+        if ( $cipher > 0 ) {
             skip 'Crypt::CBC not installed', $Num_Tests_Left
                 unless eval "require Crypt::CBC";
-            skip 'Crypt::' . $crypt->{name} . ' not installed', $Num_Tests_Left
+            skip 'Crypt::' . $crypt->{name} . ' not installed',
+                $Num_Tests_Left
                 unless eval "require Crypt::$crypt->{name}";
         }
         skip 'Digest::HMAC_SHA1 not installed', $Num_Tests_Left
             unless eval "require Digest::HMAC_SHA1";
 
-        ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' 
-            . $options->{version} 
-            . ' Cipher ' 
-            . $options->{cipher}
+        ok( $pdb = new Palm::Keyring($options),
+            'New Palm::Keyring v'
+                . $options->{version}
+                . ' Cipher '
+                . $options->{cipher}
         );
 
-        foreach my $acct (@{ $original_accts} ) {
+        foreach my $acct ( @{$original_accts} ) {
             ok( $record = $pdb->append_Record(), 'Append Record' );
-            ok( $pdb->Encrypt($record, $password, $acct), 
+            ok( $pdb->Encrypt( $record, $password, $acct ),
                 'Encrypt account into record' );
         }
 
@@ -144,11 +144,13 @@
         ok( $pdb->Password($password), 'Verify Password' );
 
         my $rec_id = 0;
-        foreach my $rec (@{ $pdb->{records} }) {
+        foreach my $rec ( @{ $pdb->{records} } ) {
             ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
-            if ($rec_id == 1) {
-                is( $decrypted->{0}->{data}, $original_accts->[1]->{0}->{data}, 
-                    'Checking record name' );
+            if ( $rec_id == 1 ) {
+                is( $decrypted->{0}->{data},
+                    $original_accts->[1]->{0}->{data},
+                    'Checking record name'
+                );
             }
             push @recs, $decrypted;
             $rec_id++;
@@ -159,36 +161,38 @@
         @recs = ();
         my $rec_num = 1;
 
-        ok( $pdb->Password($password, $new_password), 'Change PDB Password' );
+        ok( $pdb->Password( $password, $new_password ),
+            'Change PDB Password' );
 
-        foreach my $rec (@{ $pdb->{records} }) {
-        ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
-        push @recs, $decrypted;
+        foreach my $rec ( @{ $pdb->{records} } ) {
+            ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
+            push @recs, $decrypted;
         }
 
         is_deeply( \@recs, $original_accts, 'Account Matches' );
 
         my $acct;
-        ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num);
+        ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num] ),
+            'decrypt record ' . $rec_num );
 
-        ok($acct->{2}->{data} = $new_password, 'Change password');
+        ok( $acct->{2}->{data} = $new_password, 'Change password' );
 
         $pdb->{records}->[$rec_num]->{plaintext} = $acct;
         $recs[$rec_num] = $acct;
 
-        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num]), 'Change record');
+        ok( $pdb->Encrypt( $pdb->{'records'}->[$rec_num] ), 'Change record' );
 
-        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 
+        ok( $decrypted = $pdb->Decrypt( $pdb->{'records'}->[$rec_num] ),
             'Decrypt changed record' );
 
-        is_deeply($acct, $decrypted, 'Compare changed record');
+        is_deeply( $acct, $decrypted, 'Compare changed record' );
 
         my $last_decrypted = $decrypted;
         $decrypted = {};
         ok( $pdb->Password(), 'Forget password' );
 
-        eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) };
-        ok($@, 'Don\'t decrypt');
+        eval { $decrypted = $pdb->Decrypt( $pdb->{'records'}->[$rec_num] ) };
+        ok( $@, 'Don\'t decrypt' );
 
         my $got_password = 'Got nothing';
         if ($decrypted) {
@@ -206,12 +210,12 @@
         ok( $pdb->Lock(), 'Lock' );
 
         my @cleared = map { { 0 => $_->{0} } } @recs;
-        @plaintext  = map { $_->{plaintext} } @{ $pdb->{records} };
+        @plaintext = map { $_->{plaintext} } @{ $pdb->{records} };
 
         is_deeply( \@plaintext, \@cleared, 'Cleared records' );
 
         ok( unlink($file), 'Remove test pdb v' . $options->{version} );
-        }
+    }
 }
 
 1;