===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring5.t,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -r1.7 -r1.9
--- palm/Palm-Keyring/t/keyring5.t	2007/08/10 05:13:31	1.7
+++ 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.6 2007/02/27 17:08:05 andrew Exp $
+# $RedRiver: keyring5.t,v 1.8 2007/09/12 02:44:36 andrew Exp $
 use strict;
 use warnings;
 
-use Test::More tests => 122;
+use Test::More tests => 138;
 
 BEGIN { 
     use_ok( 'Palm::PDB' ); 
@@ -110,15 +110,16 @@
     }
     ];
 
+    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} 
@@ -128,7 +129,7 @@
 
         foreach my $acct (@{ $original_accts} ) {
             ok( $record = $pdb->append_Record(), 'Append Record' );
-            ok( $pdb->Encrypt($record, $acct, $password), 
+            ok( $pdb->Encrypt($record, $password, $acct), 
                 'Encrypt account into record' );
         }
 
@@ -172,14 +173,17 @@
 
         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(  $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');
 
+        my $last_decrypted = $decrypted;
         $decrypted = {};
         ok( $pdb->Password(), 'Forget password' );
 
@@ -192,6 +196,19 @@
         }
 
         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} );
         }