===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- palm/Palm-Keyring/t/keyring.t	2011/09/18 00:45:33	1.26
+++ palm/Palm-Keyring/t/keyring.t	2011/09/19 04:05:11	1.27
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use Test::More tests => 321;
+use Test::More tests => 333;
 use Data::Dumper;
 
 BEGIN {
@@ -190,7 +190,7 @@
         $new_password ) };
 like( 
     $@,
-    qr/^Invalid \s Password/xms,
+    qr/^Incorrect \s Password/xms,
     'Couldn\'t load Palm::Keyring file with no data and wrong password' 
 );
 
@@ -206,7 +206,7 @@
 $acct->{254} = {
         label    => 'misc',
         label_id => 254,
-        data     => 'This doesn\'t even really exist',
+        data     => 'This doesn\'t even really existx',
         font     => 0,
 };
 ok( $pdb->Encrypt( $record, $password, $acct ),
@@ -234,7 +234,7 @@
 eval{ $pdb->Decrypt( $record ) };
 like(
     $@,
-    qr/^Unsupported \s Crypt \s Testing \s in \s decrypt/xms,
+    qr/^Unsupported \s Crypt \s Testing/xms,
     'Couldn\'t Decrypt with unsupported Crypt'
 );
 
@@ -242,7 +242,7 @@
 eval{ $pdb->Encrypt( $record ) };
 like(
     $@,
-    qr/^Unsupported \s Crypt \s Testing \s in \s encrypt/xms,
+    qr/^Unsupported \s Crypt \s Testing/xms,
     'Couldn\'t Encrypt with unsupported Crypt'
 );
 $record->{encrypted} = $encrypted;
@@ -251,7 +251,7 @@
 eval{ $pdb->Decrypt( $record ) };
 like(
     $@,
-    qr/^Unknown \s cipher \s $bad_cipher \s in \s decrypt/xms,
+    qr/^Unknown \s cipher \s $bad_cipher/xms,
     'Couldn\'t Decrypt with unsupported cipher'
 );
 
@@ -259,7 +259,7 @@
 eval{ $pdb->Encrypt( $record ) };
 like(
     $@,
-    qr/^Unknown \s cipher \s $bad_cipher \s in \s encrypt/xms,
+    qr/^Unknown \s cipher \s $bad_cipher/xms,
     'Couldn\'t Encrypt with unsupported cipher'
 );
 $record->{encrypted} = $encrypted;
@@ -282,7 +282,7 @@
 eval{ $pdb->PackRecord($record2) };
 like( 
     $@, 
-    qr/^No \s data \s to \s PackRecord/xms,
+    qr/^No \s data \s in \s record \s to \s pack/xms,
     'Pack Empty Record with no data'
 ); 
 
@@ -291,7 +291,7 @@
 eval{ $pdb->Decrypt( $record ) };
 like(
     $@,
-    qr/^Unsupported \s version \s $bad_version \s in \s Decrypt/xms,
+    qr/^Unsupported \s Version \s $bad_version/xms,
     'Couldn\'t Decrypt with unsupported version'
 );
 
@@ -299,7 +299,7 @@
 eval{ $pdb->Encrypt( $record, undef, $acct ) };
 like(
     $@,
-    qr/^Unsupported \s version \s $bad_version \s in \s Encrypt/xms,
+    qr/^Unsupported \s Version \s $bad_version/xms,
     'Couldn\'t Encrypt with unsupported version'
 );
 
@@ -324,13 +324,12 @@
     'Couldn\'t ParseRecord with Invalid Version'
 );
 
-eval{ $pdb->Password( $password ) };
+eval{ $pdb->Password( $new_password ) };
 like( $@, 
     qr/^Unsupported \s Version \s $bad_version/xms,
     'Couldn\'t Password with Invalid Version'
 );
 
-
 $pdb     = undef;
 $record  = undef;
 $record2 = undef;
@@ -344,7 +343,9 @@
         my $record;
         my $decrypted;
         %{ $acct->{3}->{data} } = %unchanging_date;
+        my $rec_num = 0;
 
+
         my $Num_Tests_Left = 25;
     SKIP: {
             if ( defined $options->{cipher} && $options->{cipher} > 0 ) {
@@ -400,7 +401,6 @@
             ok( $record = $pdb->append_Record(), 'Append Record' );
             
             ok( $pdb->Password(), 'Clear Password' );
-
             eval{ $pdb->Encrypt() };
                 like(
                 $@,
@@ -422,7 +422,7 @@
             eval{ $pdb->Encrypt( $record, $new_password, $acct ) };
             like(
                 $@,
-                qr/^Invalid \s Password/xms,
+                qr/^Incorrect \s Password/xms,
                 'Encrypt account into record with wrong password'
             );
 
@@ -432,8 +432,13 @@
             ok( $pdb->Encrypt( $record, $password, $acct ),
                 'Encrypt account into record (with no changes)');
 
+            ok( $decrypted = $pdb->Decrypt( $pdb->{records}->[$rec_num] ),
+                'Decrypt record' );
+
+
+            is( $decrypted->{2}->{data}, $password, 'Got password' );
+
             ok( $pdb->Write($file), 'Write file' );
-            #print Dumper $pdb, $acct, $record;
 
             $pdb = undef;
 
@@ -441,8 +446,6 @@
 
             ok( $pdb->Load($file), 'Load File' );
 
-            my $rec_num = 0;
-
             eval{ $pdb->Decrypt( ) };
             like(
                 $@,
@@ -460,16 +463,14 @@
             eval{ $pdb->Decrypt( $pdb->{records}->[$rec_num], $new_password ) };
             like(
                 $@,
-                qr/^Invalid \s Password/xms,
+                qr/^Incorrect \s Password/xms,
                 'Decypt with invalid password'
             );
 
-            ok( $pdb->Password($password), 'Verify Password' );
-
             eval{  $pdb->Password($new_password) };
             like(
                 $@,
-                qr/^Invalid \s Password/xms,
+                qr/^Incorrect \s Password/xms,
                 'Verify Incorrect Password'
             );
 
@@ -479,6 +480,8 @@
                 qr/^No \s encrypted \s content!/xms,
                 'Decrypt with empty record'
             );
+
+            ok( $pdb->Password($password), 'Verify Password' );
 
             ok( $decrypted = $pdb->Decrypt( $pdb->{records}->[$rec_num] ),
                 'Decrypt record' );