===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- palm/Palm-Keyring/t/keyring.t	2007/02/27 17:08:05	1.13
+++ palm/Palm-Keyring/t/keyring.t	2007/08/10 05:13:31	1.14
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -T
-# $RedRiver: keyring.t,v 1.12 2007/02/23 22:05:17 andrew Exp $
+# $RedRiver: keyring.t,v 1.13 2007/02/27 17:08:05 andrew Exp $
 use strict;
 use warnings;
 
@@ -23,7 +23,6 @@
         version      => 5,
         password     => $password,
         cipher       => 1,
-        v4compatible => 1,
     },
 );
 
@@ -33,15 +32,40 @@
     my $decrypted;
 
     my $acct = {
-        name        => 'test3',
-        account     => 'atestaccount',
-        password    => $password,
-        notes       => 'now that really roxorZ!',
-        lastchange  => {
-            day   =>  2,
-            month =>  2,
-            year  => 99,
+        0 => {
+            label => 'name',
+            label_id => 0,
+            data  => 'test3',
+            font  => 0,
         },
+        1 => {
+            label => 'account',
+            label_id => 1,
+            data  => 'atestaccount',
+            font  => 0,
+        },
+        2 => {
+            label    => 'password',
+            label_id => 2,
+            data     => $password,
+            font  => 0,
+        },
+        3 => {
+            label => 'lastchange',
+            label_id => 3,
+            data => {
+                day   =>  2,
+                month =>  2,
+                year  => 99,
+            },
+            font  => 0,
+        },
+        255 => {
+            label => 'notes',
+            label_id => 255,
+            data  => 'now that really roxorZ!',
+            font  => 0,
+        },
     };
 
     SKIP: {
@@ -64,59 +88,58 @@
         }
 
         ok( $pdb = new Palm::Keyring($options), 
-            'New Palm::Keyring v' . $options->{version} );
+            'new Palm::Keyring v' . $options->{version});
 
         ok( $record = $pdb->append_Record(), 'Append Record' );
 
-        ok( $pdb->Encrypt($record, $acct, $password), 'Encrypt account into record' );
+        ok( $pdb->Encrypt($record, $acct, $password), 
+            'Encrypt account into record' );
 
         ok( $pdb->Write($file), 'Write file' );
 
         $pdb = undef;
 
+        ok( $pdb = new Palm::PDB(), 'new Palm::Keyring' );
 
-        my $rec_num = 1;
-        if ($options->{version} == 4) {
-            ok( $pdb = new Palm::PDB(), 'New Palm::PDB' );
-        } else {
-            ok( $pdb = new Palm::Keyring(-v4compatible => 1), 'New Palm::Keyring' );
-            $rec_num = 0;
-        }
-
         ok( $pdb->Load($file), 'Load File' );
 
         ok( $pdb->Password($password), 'Verify Password' );
 
-        ok( $decrypted = $pdb->Decrypt($pdb->{records}->[$rec_num]), 'Decrypt record' );
+        my $rec_num = 0;
+        ok( $decrypted = $pdb->Decrypt($pdb->{records}->[$rec_num]), 
+            'Decrypt record' );
 
-        is( $decrypted->{password}, $password, 'Got password' );
+        is( $decrypted->{2}->{data}, $password, 'Got password' );
 
         is_deeply( $decrypted, $acct, 'Account Matches' );
 
-        my $old_date = $decrypted->{'lastchange'};
+        my $old_date = $decrypted->{3}->{data};
 
         ok( $pdb->Password($password, $new_password), 'Change PDB Password' );
 
-        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt with new password' );
+        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 
+            'Decrypt with new password' );
 
-        my $new_date = $decrypted->{'lastchange'};
+        my $new_date = $decrypted->{3}->{data};
 
         is_deeply( $old_date, $new_date, 'Date didn\'t change' );
 
-        $acct->{'password'} = $new_password;
+        $acct->{2}->{data} = $new_password;
 
-        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 'Change record' );
+        ok(  $pdb->Encrypt($pdb->{'records'}->[$rec_num], $acct), 
+            'Change record' );
 
-        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 'Decrypt new record' );
+        ok( $decrypted = $pdb->Decrypt($pdb->{'records'}->[$rec_num]), 
+            'Decrypt new record' );
 
-        $new_date = $decrypted->{'lastchange'};
+        $new_date = $decrypted->{3}->{data};
 
         my $od = join '/', map { $old_date->{$_} } sort keys %{ $old_date };
         my $nd = join '/', map { $new_date->{$_} } sort keys %{ $new_date };
 
         isnt( $od, $nd, 'Date changed');
 
-        is( $decrypted->{password}, $new_password, 'Got new password' ); 
+        is( $decrypted->{2}->{data}, $new_password, 'Got new password' ); 
 
         $decrypted = {};
         ok( $pdb->Password(), 'Forget password' );