From 9f84c2ba374a07fcf12fdf41c0d6f1fc3f315655 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Tue, 17 May 2011 14:42:25 +0200
Subject: Move create_salt to App::Raps2::Password, make $pw->salt() return
 current salt

---
 t/20-app-raps2-password.t | 26 ++------------------------
 t/29-app-raps2.t          |  4 +---
 2 files changed, 3 insertions(+), 27 deletions(-)

(limited to 't')

diff --git a/t/20-app-raps2-password.t b/t/20-app-raps2-password.t
index ae4f267..5faa7e9 100644
--- a/t/20-app-raps2-password.t
+++ b/t/20-app-raps2-password.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.010;
 
-use Test::More tests => 19;
+use Test::More tests => 17;
 use Test::Fatal;
 
 my $pw;
@@ -16,14 +16,6 @@ like(
 	exception {
 		App::Raps2::Password->new();
 	},
-	qr{incorrect salt length},
-	'new() missing salt and passphrase'
-);
-
-like(
-	exception {
-		App::Raps2::Password->new(salt => $salt);
-	},
 	qr{no passphrase given},
 	'new() missing passphrase'
 );
@@ -39,14 +31,6 @@ like(
 	'new() missing passphrase'
 );
 
-like(
-	exception {
-		App::Raps2::Password->new(passphrase => $pass);
-	},
-	qr{incorrect salt length},
-	'new() missing salt'
-);
-
 like(
 	exception {
 		App::Raps2::Password->new(
@@ -100,13 +84,7 @@ like(
 
 ok($pw->verify($pw->crypt('truth')), 'crypt->verify okay');
 
-like(
-	exception {
-		$pw->salt();
-	},
-	qr{incorrect salt length},
-	'salt: No argument',
-);
+is($pw->salt(), $salt, 'salt() returns current salt');
 
 like(
 	exception {
diff --git a/t/29-app-raps2.t b/t/29-app-raps2.t
index ceaaf51..8034791 100644
--- a/t/29-app-raps2.t
+++ b/t/29-app-raps2.t
@@ -3,7 +3,7 @@ use strict;
 use warnings;
 use 5.010;
 
-use Test::More tests => 4;
+use Test::More tests => 3;
 use Test::Fatal;
 
 use_ok('App::Raps2');
@@ -11,8 +11,6 @@ use_ok('App::Raps2');
 my $r2 = App::Raps2->new();
 isa_ok($r2, 'App::Raps2');
 
-is(length($r2->create_salt()), 16, 'create_salt: correct length');
-
 is_deeply(
 	{ $r2->file_to_hash('t/in/hash') },
 	{ key => 'value', otherkey => 'othervalue' },
-- 
cgit v1.2.3