===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- palm/Palm-Keyring/t/keyring.t	2008/09/18 07:06:11	1.20
+++ palm/Palm-Keyring/t/keyring.t	2008/09/19 03:08:01	1.21
@@ -1,9 +1,9 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring.t,v 1.19 2008/09/18 02:02:50 andrew Exp $
+# $RedRiver: keyring.t,v 1.20 2008/09/18 06:06:11 andrew Exp $
 use strict;
 use warnings;
 
-use Test::More tests => 198;
+use Test::More tests => 194;
 use Data::Dumper;
 
 BEGIN {
@@ -106,11 +106,13 @@
 is( Palm::Keyring::labels(), undef, "Didn't get label empty label" );
 is_deeply( Palm::Keyring::labels($bad_label),
     \%label_not_found_details, "Got default label for $bad_label" );
-is( Palm::Keyring::labels($bad_label_name), undef, "Didn't get label for
-    $bad_label_name"
+is( Palm::Keyring::labels($bad_label_name), undef, "Didn't get label for $bad_label_name"
 );
 
+
+
 my $pdb;
+
 eval { $pdb = new Palm::Keyring( -file => 't/Keys-invalid_version.pdb' ) };
 like(
     $@,
@@ -128,34 +130,21 @@
 ok( $pdb = new Palm::Keyring( -file => 't/Keys-no_data.pdb' ),
     'Loaded Palm::Keyring file with no data' );
 
+ok( $pdb->Password($password), 'Entering Password' );
+
 my $record;
 ok( $record = $pdb->append_Record(), 'Append Record' );
 ok( $pdb->Encrypt( $record, $password, $acct ),
     'Encrypt account into record' );
+ok( $pdb->PackRecord($record), 'Pack Proper Record');
+ok( $record = $pdb->ParseRecord(%{ $record }), 'Parse Proper Packed');
+
 my $record2;
 ok( $record2 = $pdb->append_Record(), 'Append Record' );
+ok( $pdb->PackRecord($record2), 'Pack Empty Record'); 
+ok( $record = $pdb->ParseRecord(%{ $record2 }), 'Parse Empty Packed');
 
-ok( $pdb->PackRecord($record), 'Pack Proper Record');
-eval{ $pdb->PackRecord($record2) };
-like( 
-    $@,
-    qr/^No \s encrypted \s content \s to \s pack/xms,
-    'Fail to pack record without encrypted content'
-);
 
-$record2->{encrypted} = '';
-eval{ $pdb->PackRecord($record2) };
-like( 
-    $@,
-    qr/^No \s ivec/xms,
-    'Fail to pack record without ivec'
-);
-
-$record2->{ivec} = 1;
-ok( $pdb->PackRecord($record2), 'Pack Proper Record');
-
-ok( $record = $pdb->ParseRecord(%{ $record }), 'Parse Proper Packed');
-
 $pdb->{version} = 999;
 eval{ $pdb->PackRecord($record) };
 like( $@, 
@@ -169,6 +158,14 @@
     'Couldn\'t ParseRecord with Invalid Version'
 );
 
+eval { $pdb->Write($file) };
+like(
+    $@,
+    qr/^Unsupported \s Version \s 999/xms,
+    'Couldn\'t Write file with unsupported version'
+);
+
+
 $pdb = undef;
 
 unlink $file;
@@ -313,16 +310,8 @@
             is_deeply( $plaintext[0], $cleared_decrypted, 'Cleared records' );
 
             $pdb->{records}->[0]->{data} = undef;
-            ok( $pdb->Write($file), 'Write file' );
-            ok( $pdb->Load($file),  'Load File' );
-
-            $pdb->{version} = 999;
-            eval { $pdb->Write($file) };
-            like(
-                $@,
-                qr/^Unsupported \s Version \s 999/xms,
-                'Couldn\'t Write file with unsupported version'
-            );
+            ok( $pdb->Write($file), 'Write file without data' );
+            ok( $pdb->Load($file),  'Load File without data' );
 
             ok( unlink($file), 'Remove test pdb v' . $options->{version} );