===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.4
retrieving revision 1.18
diff -u -r1.4 -r1.18
--- palm/Palm-Keyring/t/keyring.t	2007/02/01 01:56:11	1.4
+++ palm/Palm-Keyring/t/keyring.t	2008/09/18 02:53:27	1.18
@@ -1,190 +1,179 @@
-# Before `make install' is performed this script should be runnable with
-# `make test'. After `make install' it should work as `perl test.pl'
+#!/usr/bin/perl -T
+# $RedRiver: keyring.t,v 1.17 2007/09/13 15:41:36 andrew Exp $
+use strict;
+use warnings;
 
-######################### We start with some black magic to print on failure.
+use Test::More tests => 52;
+use Data::Dumper;
 
-# Change 1..1 below to 1..last_test_to_print .
-# (It may become useful if the test is moved to ./t subdirectory.)
+BEGIN {
+    use_ok('Palm::PDB');
+    use_ok('Palm::Keyring');
+}
 
-my $test = 1;
-BEGIN { $| = 1; print "1..17\n"; }
-END {print "not ok $test\n" unless $loaded;}
-use Palm::PDB;
-use Palm::Keyring;
-$loaded = 1;
-print "ok $test\n";
-$test++;
+my $file         = 'Keys-test.pdb';
+my $password     = '12345';
+my $new_password = '54321';
 
-######################### End of black magic.
+my @o = (
+    {   version  => 4,
+        password => $password,
+    },
+    {   version  => 5,
+        password => $password,
+        cipher   => 1,
+    },
+);
 
-# Insert your test code below (better if it prints "ok 13"
-# (correspondingly "not ok 13") depending on the success of chunk 13
-# of the test code):
+    my $acct = {
+        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,
+        },
+    };
 
-my $file = 'Keys-GTKR-test.pdb';
-my $password = '12345';
-my $new_password = '54321';
-my $acct = {
-    name        => 'test3',
-	account     => 'atestaccount',
-	password    => $password,
-	notes       => 'now that really roxorZ!',
-    lastchange  => {
-        day   =>  2,
-        month =>  2,
-        year  => 99,
-    },
-};
+foreach my $options (@o) {
+    my $pdb;
+    my $record;
+    my $decrypted;
 
-my $pdb;
-my $record;
+    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', $Num_Tests_Left
+                unless eval "require Crypt::CBC";
+            skip 'Crypt::' . $crypt->{name} . ' not installed',
+                $Num_Tests_Left
+                unless eval "require Crypt::$crypt->{name}";
+        }
 
-eval { $pdb = new Palm::Keyring($password) };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        if ( $options->{version} == 4 ) {
+            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', $Num_Tests_Left
+                unless eval "require Digest::HMAC_SHA1 ";
+        }
 
-eval { $record = $pdb->append_Record() };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $pdb = new Palm::Keyring($options),
+            'new Palm::Keyring v' . $options->{version}
+        );
 
-eval { $pdb->Encrypt($record, $acct, $password) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $record = $pdb->append_Record(), 'Append Record' );
 
-eval { $pdb->Write($file) };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $pdb->Encrypt( $record, $password, $acct ),
+            'Encrypt account into record' );
 
-$pdb = new Palm::PDB;
-$acct = {};
+        ok( $pdb->Write($file), 'Write file' );
 
-eval { $pdb->Load($file) };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        $pdb = undef;
 
-eval { $pdb->Password($password) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $pdb = new Palm::PDB(), 'new Palm::Keyring' );
 
-eval { $acct = $pdb->Decrypt($pdb->{'records'}->[1]) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $pdb->Load($file), 'Load File' );
 
-if ($acct->{'password'} eq $password) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $pdb->Password($password), 'Verify Password' );
 
-my $old_date = $acct->{'lastchange'};
+        my $rec_num = 0;
+        ok( $decrypted = $pdb->Decrypt( $pdb->{records}->[$rec_num] ),
+            'Decrypt record' );
 
-eval { $pdb->Password($password, $new_password) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        is( $decrypted->{2}->{data}, $password, 'Got password' );
 
-$acct = {};
-eval { $acct = $pdb->Decrypt($pdb->{'records'}->[1]) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        is_deeply( $decrypted, $acct, 'Account Matches' );
 
-if ($acct->{'password'} eq $password) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        my $old_date = $decrypted->{3}->{data};
 
-my $new_date = $acct->{'lastchange'};
+        ok( $pdb->Password( $password, $new_password ),
+            'Change PDB Password' );
 
-if (
-    $old_date->{'day'}   == $new_date->{'day'}   &&
-    $old_date->{'month'} == $new_date->{'month'} &&
-    $old_date->{'year'}  == $new_date->{'year'}
-) {
-    print "ok $test\n";
-} else {
-    print "not ok $test\n";
-}
-$test++;
+        ok( $decrypted = $pdb->Decrypt( $pdb->{'records'}->[$rec_num] ),
+            'Decrypt with new password' );
 
-$acct->{'password'} = $new_password;
+        my $new_date = $decrypted->{3}->{data};
 
-eval { $acct = $pdb->Encrypt($pdb->{'records'}->[1], $acct) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        is_deeply( $old_date, $new_date, 'Date didn\'t change' );
 
-$old_date = $new_date;
-$new_date = $acct->{'lastchange'};
+        $acct->{2}->{data} = $new_password;
 
-eval { $acct = $pdb->Decrypt($pdb->{'records'}->[1]) || die };
-unless( $@ ) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        $pdb->{records}->[$rec_num]->{plaintext} = $acct;
 
-if (
-    $old_date->{'day'}   != $new_date->{'day'}   ||
-    $old_date->{'month'} != $new_date->{'month'} ||
-    $old_date->{'year'}  != $new_date->{'year'}
-) {
-    print "ok $test\n";
-} else {
-    print "not ok $test\n";
-}
-$test++;
+        ok( $pdb->Encrypt( $pdb->{'records'}->[$rec_num] ), 'Change record' );
 
-if ($acct->{'password'} eq $new_password) {
-	print "ok $test\n";
-} else {
-	print "not ok $test\n";
-}
-$test++;
+        ok( $decrypted = $pdb->Decrypt( $pdb->{'records'}->[$rec_num] ),
+            'Decrypt new record' );
 
+        $new_date = $decrypted->{3}->{data};
 
-unlink($file);
+        my $od = join '/', map { $old_date->{$_} } sort keys %{$old_date};
+        my $nd = join '/', map { $new_date->{$_} } sort keys %{$new_date};
 
-1;
+        isnt( $od, $nd, 'Date changed' );
 
+        is( $decrypted->{2}->{data}, $new_password, 'Got new password' );
+
+        my $last_decrypted = $decrypted;
+
+        $decrypted = {};
+        ok( $pdb->Password(), 'Forget password' );
+
+        eval { $decrypted = $pdb->Decrypt( $pdb->{'records'}->[$rec_num] ) };
+        ok( $@, 'Don\'t decrypt' );
+
+        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} );
+
+    }
+}
+
+1;