===================================================================
RCS file: /cvs/palm/Palm-Keyring/t/keyring.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- palm/Palm-Keyring/t/keyring.t	2007/01/28 16:12:47	1.2
+++ palm/Palm-Keyring/t/keyring.t	2007/01/30 04:59:55	1.3
@@ -6,65 +6,123 @@
 # Change 1..1 below to 1..last_test_to_print .
 # (It may become useful if the test is moved to ./t subdirectory.)
 
-BEGIN { $| = 1; print "1..6\n"; }
-END {print "not ok 1\n" unless $loaded;}
+my $test = 1;
+BEGIN { $| = 1; print "1..12\n"; }
+END {print "not ok $test\n" unless $loaded;}
+use Palm::PDB;
 use Palm::Keyring;
 $loaded = 1;
-print "ok 1\n";
+print "ok $test\n";
+$test++;
 
-
 ######################### End of black magic.
 
 # 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 $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!',
+};
+
 my $pdb;
+my $record;
 
 eval { $pdb = new Palm::Keyring($password) };
 unless( $@ ) {
-	print "ok 2\n";
+	print "ok $test\n";
 } else {
-	print "not ok 2\n";
+	print "not ok $test\n";
 }
+$test++;
 
-my $record;
-
 eval { $record = $pdb->append_Record() };
 unless( $@ ) {
-	print "ok 3\n";
+	print "ok $test\n";
 } else {
-	print "not ok 3\n";
+	print "not ok $test\n";
 }
+$test++;
 
-$record->{plaintext} = {
-	name        => 'Test3',
-	account     => 'atestaccount',
-	password    => $password,
-	description => 'now that really roxorZ!',
-};
+eval { $pdb->Encrypt($record, $acct, $password) || die };
+unless( $@ ) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
 
-my $file = 'Keys-GTKR-test.pdb';
+eval { $pdb->Write($file) };
+unless( $@ ) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
 
-if ( $pdb->Write($file) ) {
-	print "ok 4\n";
+$pdb = new Palm::PDB;
+$acct = {};
+
+eval { $pdb->Load($file) };
+unless( $@ ) {
+	print "ok $test\n";
 } else {
-	print "not ok 4\n";
+	print "not ok $test\n";
 }
+$test++;
 
-if ( $pdb->Load($file, $password) ) {
-	print "ok 5\n";
+eval { $pdb->Password($password) || die };
+unless( $@ ) {
+	print "ok $test\n";
 } else {
-	print "not ok 5\n";
+	print "not ok $test\n";
 }
+$test++;
 
-if ($pdb->{'records'}->[1]->{'plaintext'}->{'password'} eq $password) {
-	print "ok 6\n";
+eval { $acct = $pdb->Decrypt($pdb->{'records'}->[1]) || die };
+unless( $@ ) {
+	print "ok $test\n";
 } else {
-	print "not ok 6\n";
+	print "not ok $test\n";
 }
+$test++;
 
+if ($acct->{'password'} eq $password) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
+
+eval { $pdb->Password($password, $new_password) || die };
+unless( $@ ) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
+
+$acct = {};
+eval { $acct = $pdb->Decrypt($pdb->{'records'}->[1]) || die };
+unless( $@ ) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
+
+if ($acct->{'password'} eq $password) {
+	print "ok $test\n";
+} else {
+	print "not ok $test\n";
+}
+$test++;
 unlink($file);
 
 1;