===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- palm/Palm-Keyring/t/keyring5.t	2007/02/19 00:28:28	1.1
+++ palm/Palm-Keyring/t/keyring5.t	2007/02/19 01:37:10	1.2
@@ -1,9 +1,9 @@
 #!/usr/bin/perl
-# $RedRiver: keyring.t,v 1.9 2007/02/19 00:22:42 andrew Exp $
+# $RedRiver: keyring5.t,v 1.1 2007/02/19 00:28:28 andrew Exp $
 use strict;
 use warnings;
 
-use Test::More tests => 44;
+use Test::More tests => 118;
 use YAML;
 
 BEGIN { 
@@ -15,97 +15,156 @@
 my $password = '12345';
 my $new_password = '54321';
 
-my @o = (
-    {
-        version  => 4,
-        password => $password,
-    },
-    {
-        version      => 5,
-        password     => $password,
-        cipher       => 1,
-        v4compatible => 1,
-    },
-);
-
-foreach my $options (@o) {
+foreach my $cipher (0..3) {
     my $pdb;
+    my @recs;
     my $record;
     my $decrypted;
 
-    my $acct = {
-        name        => 'test3',
-        account     => 'atestaccount',
-        password    => $password,
-        notes       => 'now that really roxorZ!',
-        lastchange  => {
-            day   =>  2,
-            month =>  2,
-            year  => 99,
-        },
+    my $options = {
+        version  => 5,
+        password => $password,
+        cipher   => $cipher,
     };
 
-    ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' . $options->{version} );
+    my $original_accts = [
+    [
+    {
+        'label_id' => 2,
+        'data' => 'only password is set',
+        'label' => 'password',
+        'font' => 0
+    },
+    {
+        'label_id' => 3,
+        'data' => {
+            'month' => 1,
+            'day' => 1,
+            'year' => 107
+        },
+        'label' => 'lastchange',
+        'font' => 0
+    }
+    ],
+    [
+    {
+        'label_id' => 1,
+        'data' => 'test',
+        'label' => 'account',
+        'font' => 0
+    },
+    {
+        'label_id' => 2,
+        'data' => 'abcd1234',
+        'label' => 'password',
+        'font' => 0
+    },
+    {
+        'label_id' => 3,
+        'data' => {
+            'month' => 1,
+            'day' => 11,
+            'year' => 107
+        },
+        'label' => 'lastchange',
+        'font' => 0
+    },
+    {
+        'label_id' => 255,
+        'data' => 'This is a short note.',
+        'label' => 'notes',
+        'font' => 0
+    }
+    ],
+    [
+    {
+        'label_id' => 2,
+        'data' => 'password (date is 2/2/07)',
+        'label' => 'password',
+        'font' => 0
+    },
+    {
+        'label_id' => 3,
+        'data' => {
+            'month' => 1,
+            'day' => 2,
+            'year' => 107
+        },
+        'label' => 'lastchange',
+        'font' => 0
+    }
+    ]
+    ];
 
-    ok( $record = $pdb->append_Record(), 'Append Record' );
+    ok( $pdb = new Palm::Keyring($options), 'New Palm::Keyring v' 
+        . $options->{version} 
+        . ' Cipher ' 
+        . $options->{cipher}
+    );
 
-    ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
+    foreach my $acct (@{ $original_accts} ) {
+        ok( $record = $pdb->append_Record(), 'Append Record' );
+        ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
+    }
 
     ok( $pdb->Write($file), 'Write file' );
 
     $pdb = undef;
 
+    ok( $pdb = new Palm::PDB(), 'New Palm::PDB' );
 
-    my $rec_num = 1;
-    if ($options->{version} == 4) {
-        ok( $pdb = new Palm::PDB(), 'New Palm::PDB' );
-    } else {
-        ok( $pdb = new Palm::Keyring(-v4compatible => 1), 'New Palm::Keyring' );
-        $rec_num = 0;
-    }
-
     ok( $pdb->Load($file), 'Load File' );
 
     ok( $pdb->Password($password), 'Verify Password' );
 
-    ok( $decrypted = $pdb->Decrypt($pdb->{records}->[$rec_num]), 'Decrypt record' );
+    foreach my $rec (@{ $pdb->{records} }) {
+        ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
+        push @recs, $decrypted;
+    }
 
-    is( $decrypted->{password}, $password, 'Got password' );
+    is_deeply( $original_accts, \@recs, 'Account Matches' );
 
-    is_deeply( $decrypted, $acct, 'Account Matches' );
+    @recs = ();
+    my $rec_num = 1;
 
-    my $old_date = $decrypted->{'lastchange'};
-
     ok( $pdb->Password($password, $new_password), 'Change PDB Password' );
 
-    ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt with new password' );
+    foreach my $rec (@{ $pdb->{records} }) {
+        ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
+        push @recs, $decrypted;
+    }
 
-    my $new_date = $decrypted->{'lastchange'};
+    is_deeply( $original_accts, \@recs, 'Account Matches' );
 
-    is_deeply( $old_date, $new_date, 'Date didn\'t change' );
+    my $acct;
+    ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num);
 
-    $acct->{'password'} = $new_password;
+    foreach my $field (@{ $acct }) {
+        next unless $field->{label} eq 'password';
+        ok($field->{data} = $new_password, 'Change password');
+    }
 
     ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' );
 
-    ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt new record' );
+    ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt changed record' );
 
-    $new_date = $decrypted->{'lastchange'};
+    is_deeply($acct, $decrypted, 'Compare changed record');
 
-    my $od = join '/', map { $old_date->{$_} } sort keys %{ $old_date };
-    my $nd = join '/', map { $new_date->{$_} } sort keys %{ $new_date };
-
-    isnt( $od, $nd, 'Date changed');
-
-    is( $decrypted->{password}, $new_password, 'Got new password' ); 
-
-    $decrypted = {};
+    $decrypted = [];
     ok( $pdb->Password(), 'Forget password' );
 
-    eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[1]) };
-    ok( $@, 'Don\'t decrypt' );
+    eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) };
+    ok($@, 'Don\'t decrypt');
 
-    isnt( $decrypted->{password}, $new_password, 'Didn\'t get new password' );
+    my $got_password = 'Got nothing';
+    if ($decrypted) {
+        foreach my $field (@{ $decrypted }) {
+            next unless $field->{label} eq 'password';
+            $got_password = $field->{data};
+        }
+    }
+
+    isnt( $got_password, $new_password, 'Didn\'t get new password' );
 
     ok( unlink($file), 'Remove test pdb v' . $options->{version} );
 }