===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.14
retrieving revision 1.17
diff -u -r1.14 -r1.17
--- palm/Palm-Keyring/t/keyring.t	2007/08/10 05:13:31	1.14
+++ palm/Palm-Keyring/t/keyring.t	2007/09/13 16:41:36	1.17
@@ -1,9 +1,10 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring.t,v 1.13 2007/02/27 17:08:05 andrew Exp $
+# $RedRiver: keyring.t,v 1.16 2007/09/13 00:02:52 andrew Exp $
 use strict;
 use warnings;
 
-use Test::More tests => 44;
+use Test::More tests => 52;
+use Data::Dumper;
 
 BEGIN { 
     use_ok( 'Palm::PDB' ); 
@@ -68,23 +69,24 @@
         },
     };
 
+    my $Num_Tests_Left = 25;
     SKIP: {
         if (defined $options->{cipher} && $options->{cipher} > 0) {
             my $crypt = Palm::Keyring::crypts($options->{cipher});
-            skip 'Crypt::CBC not installed', 21 unless 
-                eval "require Crypt::CBC";
-            skip 'Crypt::' . $crypt->{name} . ' not installed', 21 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}";
         }
 
         if ($options->{version} == 4) {
-            skip 'Crypt::DES not installed', 21 unless 
-                eval " require Crypt::DES ";
-            skip 'Digest::MD5 not installed', 21 unless 
-                eval " require Digest::MD5 ";
+            skip 'Crypt::DES not installed', $Num_Tests_Left
+                unless eval "require Crypt::DES ";
+            skip 'Digest::MD5 not installed', $Num_Tests_Left 
+                unless eval "require Digest::MD5 ";
         } elsif ($options->{version} == 5) {
-            skip 'Digest::HMAC_SHA1 not installed', 21 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), 
@@ -92,7 +94,7 @@
 
         ok( $record = $pdb->append_Record(), 'Append Record' );
 
-        ok( $pdb->Encrypt($record, $acct, $password), 
+        ok( $pdb->Encrypt($record, $password, $acct), 
             'Encrypt account into record' );
 
         ok( $pdb->Write($file), 'Write file' );
@@ -126,9 +128,10 @@
 
         $acct->{2}->{data} = $new_password;
 
-        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 
-            'Change record' );
+        $pdb->{records}->[$rec_num]->{plaintext} = $acct;
 
+        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num]), 'Change record' );
+
         ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 
             'Decrypt new record' );
 
@@ -141,6 +144,8 @@
 
         is( $decrypted->{2}->{data}, $new_password, 'Got new password' ); 
 
+        my $last_decrypted = $decrypted;
+
         $decrypted = {};
         ok( $pdb->Password(), 'Forget password' );
 
@@ -149,7 +154,22 @@
 
         isnt( $decrypted->{password}, $new_password, 'Didn\'t get new password' );
 
+        ok( $pdb->Unlock($new_password), 'Unlock' );
+
+        my @plaintext = map { $_->{plaintext} } @{ $pdb->{records} };
+
+        is_deeply( $plaintext[0], $last_decrypted, 'Account Matches' );
+
+        ok( $pdb->Lock(), 'Lock' );
+
+        my $cleared_decrypted = {};
+        $cleared_decrypted->{0}= $last_decrypted->{0};
+        @plaintext = map { $_->{plaintext} } @{ $pdb->{records} };
+
+        is_deeply( $plaintext[0], $cleared_decrypted, 'Cleared records' );
+
         ok( unlink($file), 'Remove test pdb v' . $options->{version} );
+
     }
 }