===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.6
retrieving revision 1.9
diff -u -r1.6 -r1.9
--- palm/Palm-Keyring/t/keyring5.t	2007/02/27 17:08:05	1.6
+++ palm/Palm-Keyring/t/keyring5.t	2007/09/13 16:44:39	1.9
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring5.t,v 1.5 2007/02/23 22:05:17 andrew Exp $
+# $RedRiver: keyring5.t,v 1.8 2007/09/12 02:44:36 andrew Exp $
 use strict;
 use warnings;
 
-use Test::More tests => 126;
+use Test::More tests => 138;
 
 BEGIN { 
     use_ok( 'Palm::PDB' ); 
@@ -15,6 +15,7 @@
 my $new_password = '54321';
 
 foreach my $cipher (0..3) {
+#next unless $cipher == 0;
     my $pdb;
     my @recs;
     my $record;
@@ -28,17 +29,21 @@
         cipher   => $cipher,
     };
 
-    my $rec1_name = 'test';
-
     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,
@@ -48,15 +53,21 @@
         '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,
@@ -66,21 +77,27 @@
         '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,
@@ -90,18 +107,19 @@
         'label' => 'lastchange',
         'font' => 0,
     }
-    ]
+    }
     ];
 
+    my $Num_Tests_Left = 34;
     SKIP: {
         if ($cipher > 0) {
-            skip 'Crypt::CBC not installed', 31 unless 
-                eval "require Crypt::CBC";
-            skip 'Crypt::' . $crypt->{name} . ' not installed', 31 unless 
-                eval "require Crypt::$crypt->{name}";
+            skip 'Crypt::CBC not installed', $Num_Tests_Left
+                unless eval "require Crypt::CBC";
+            skip 'Crypt::' . $crypt->{name} . ' not installed', $Num_Tests_Left
+                unless eval "require Crypt::$crypt->{name}";
         }
-        skip 'Digest::HMAC_SHA1 not installed', 31 unless 
-            eval " require Digest::HMAC_SHA1 ";
+        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} 
@@ -109,14 +127,10 @@
             . $options->{cipher}
         );
 
-        my $rec_id = 0;
         foreach my $acct (@{ $original_accts} ) {
             ok( $record = $pdb->append_Record(), 'Append Record' );
-            if ($rec_id == 1) {
-                ok( $record->{name} = $rec1_name, 'Setting record name' );
-            }
-            ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
-            $rec_id++;
+            ok( $pdb->Encrypt($record, $password, $acct), 
+                'Encrypt account into record' );
         }
 
         ok( $pdb->Write($file), 'Write file' );
@@ -129,15 +143,16 @@
 
         ok( $pdb->Password($password), 'Verify Password' );
 
-        $rec_id = 0;
+        my $rec_id = 0;
         foreach my $rec (@{ $pdb->{records} }) {
-        ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
-        if ($rec_id == 1) {
-        is( $rec->{name}, $rec1_name, 'Checking record name' );
+            ok( $decrypted = $pdb->Decrypt($rec), 'Decrypt record' );
+            if ($rec_id == 1) {
+                is( $decrypted->{0}->{data}, $original_accts->[1]->{0}->{data}, 
+                    'Checking record name' );
+            }
+            push @recs, $decrypted;
+            $rec_id++;
         }
-        push @recs, $decrypted;
-        $rec_id++;
-        }
 
         is_deeply( \@recs, $original_accts, 'Account Matches' );
 
@@ -156,18 +171,20 @@
         my $acct;
         ok( $acct = $pdb->Decrypt( $pdb->{records}->[$rec_num]), 'decrypt record ' . $rec_num);
 
-        foreach my $field (@{ $acct }) {
-        next unless $field->{label} eq 'password';
-        ok($field->{data} = $new_password, 'Change password');
-        }
+        ok($acct->{2}->{data} = $new_password, 'Change password');
 
-        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' );
+        $pdb->{records}->[$rec_num]->{plaintext} = $acct;
+        $recs[$rec_num] = $acct;
 
-        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt changed record' );
+        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num]), 'Change record');
 
+        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 
+            'Decrypt changed record' );
+
         is_deeply($acct, $decrypted, 'Compare changed record');
 
-        $decrypted = [];
+        my $last_decrypted = $decrypted;
+        $decrypted = {};
         ok( $pdb->Password(), 'Forget password' );
 
         eval{ $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]) };
@@ -175,13 +192,23 @@
 
         my $got_password = 'Got nothing';
         if ($decrypted) {
-        foreach my $field (@{ $decrypted }) {
-        next unless $field->{label} eq 'password';
-        $got_password = $field->{data};
+            $got_password = $decrypted->{2}->{data};
         }
-        }
 
         isnt( $got_password, $new_password, 'Didn\'t get new password' );
+
+        ok( $pdb->Unlock($new_password), 'Unlock' );
+
+        my @plaintext = map { $_->{plaintext} } @{ $pdb->{records} };
+
+        is_deeply( \@plaintext, \@recs, 'Account Matches' );
+
+        ok( $pdb->Lock(), 'Lock' );
+
+        my @cleared = map { { 0 => $_->{0} } } @recs;
+        @plaintext  = map { $_->{plaintext} } @{ $pdb->{records} };
+
+        is_deeply( \@plaintext, \@cleared, 'Cleared records' );
 
         ok( unlink($file), 'Remove test pdb v' . $options->{version} );
         }