Better test coverage

diff --git a/Makefile.PL b/Makefile.PL
index 2a1fa638094fd49b81107701fa4b96b73e437754..6d653e07686bf4b702ab8be2b7fa6033b9d6128f 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -34,6 +34,9 @@ WriteMakefile(
                   Object::Tiny              0
                   Data::Entropy::Algorithms 0/,
        },
+       TEST_REQUIRES     => {
+               qw/Test::Exception           0/,
+       },
        INC               => '-I. -Iscrypt-1.2.1',
        LIBS              => ['-lcrypto'],
        MYEXTLIB          => 'scrypt-1.2.1/libscrypt_sse2.a',

diff --git a/t/Authen-Passphrase-Scrypt.t b/t/Authen-Passphrase-Scrypt.t
index dce2a7abd85f4625e2fbe109b7f766e8fa2d5252..aceef26d43612a5ba596ddfaa5ea0f462fdb33d4 100644 (file)
--- a/t/Authen-Passphrase-Scrypt.t
+++ b/t/Authen-Passphrase-Scrypt.t
@@ -2,7 +2,9 @@
 use strict;
 use warnings;
 
-use Test::More tests => 9;
+use Test::More tests => 16;
+use Test::Exception;
+
 BEGIN { use_ok('Authen::Passphrase::Scrypt') };
 
 # Vectors in the scrypt paper
@@ -33,11 +35,29 @@ $x = Authen::Passphrase::Scrypt->from_rfc2307($test_rfc2307);
 ok !$x->match('password1'), 'from_rfc2307 + match';
 ok $x->match('password2'), 'from_rfc2307 + match';
 
-my $y = Authen::Passphrase::Scrypt->new({
+my $y = Authen::Passphrase::Scrypt->new(
        passphrase => 'password2',
        salt => $x->salt,
        logN => $x->logN,
        r => 8,
-});
+);
 
 is $y->as_rfc2307, $test_rfc2307, 'as_rfc2307';
+
+my $bad_rfc2307_1 = '{SCRYPT}notavalidscryptstringaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+my $bad_rfc2307_2 = '{SCRYPT}c2NyeXB0AAwAAAAIAAAAAZ/+bp8gWcTZgEC7YQZeLLyxFeKRRdDkwbaGeFC0NkdUraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+
+throws_ok { Authen::Passphrase::Scrypt->new }
+  qr/passphrase not set/, 'new without passphrase';
+throws_ok { Authen::Passphrase::Scrypt->from_rfc2307('bad') }
+  qr/Invalid Scrypt RFC2307/, 'from_rfc2307 with bad string';
+throws_ok { Authen::Passphrase::Scrypt->from_rfc2307($bad_rfc2307_1) }
+  qr/Invalid Scrypt RFC2307: should start/, 'from_rfc2307 with another bad string';
+throws_ok { Authen::Passphrase::Scrypt->from_rfc2307($bad_rfc2307_2) }
+  qr/Invalid Scrypt RFC2307: bad checksum/, 'from_rfc2307 with yet another rfc2307';
+throws_ok { Authen::Passphrase::Scrypt->from_crypt('') }
+  qr/does not support crypt strings/, 'from_crypt';
+throws_ok { $y->as_crypt }
+  qr/does not support crypt strings/, 'as_crypt';
+throws_ok { Authen::Passphrase::Scrypt->new(passphrase => 'xkcd', r => (1 << 30), p => (1 << 30)) }
+  qr/Error in crypto_scrypt/, 'new with huge r and p';