From 3cc88b443be12b243870e35ddc335a96be6499bb Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Wed, 6 Jul 2011 10:15:27 +0200
Subject: Merge t/25-app-raps2-basic and t/29-app-raps2-store

---
 t/25-app-raps2-basic.t | 17 ---------------
 t/29-app-raps2-store.t | 50 --------------------------------------------
 t/29-app-raps2.t       | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 56 insertions(+), 67 deletions(-)
 delete mode 100644 t/25-app-raps2-basic.t
 delete mode 100644 t/29-app-raps2-store.t
 create mode 100644 t/29-app-raps2.t

diff --git a/t/25-app-raps2-basic.t b/t/25-app-raps2-basic.t
deleted file mode 100644
index 127f904..0000000
--- a/t/25-app-raps2-basic.t
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.010;
-
-use Test::More tests => 3;
-
-use_ok('App::Raps2');
-
-my $r2 = App::Raps2->new( dont_touch_fs => 1, no_cli => 1 );
-isa_ok($r2, 'App::Raps2');
-
-is_deeply(
-	$r2->file_to_hash('t/in/hash'),
-	{ key => 'value', otherkey => 'othervalue' },
-	'file_to_hash works',
-);
diff --git a/t/29-app-raps2-store.t b/t/29-app-raps2-store.t
deleted file mode 100644
index 026a529..0000000
--- a/t/29-app-raps2-store.t
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.010;
-
-use Test::More tests => 9;
-
-$ENV{XDG_CONFIG_HOME} = 't/config';
-$ENV{XDG_DATA_HOME}   = 't/data';
-
-use_ok('App::Raps2');
-
-my $r2 = App::Raps2->new( master_password => 'sekrit', no_cli => 1 );
-isa_ok( $r2, 'App::Raps2' );
-
-ok( -e 't/config/raps2/password', 'config file created' );
-
-$r2->pw_save(
-	password => 'foopass',
-	name     => 'test1'
-  ),
-
-  ok( -e 't/data/raps2/test1', 'Save password test1' );
-
-is( $r2->pw_load( name => 'test1' )->{password},
-	'foopass', 'Password for test1 loaded ok' );
-
-$r2->pw_save(
-	password => 'foopass',
-	file     => 't/data/raps2/test2',
-	url      => 'murl',
-	login    => 'mlogin',
-	extra    => 'mextra',
-  ),
-
-  is( $r2->pw_load_info( file => 't/data/raps2/test2' )->{url},
-	'murl', 'Password info loaded ok (url)' );
-
-is( $r2->pw_load_info( file => 't/data/raps2/test2' )->{login},
-	'mlogin', 'Password info loaded ok (login)' );
-
-is( $r2->pw_load( file => 't/data/raps2/test2' )->{password},
-	'foopass', 'Password for test2 loaded ok' );
-
-is( $r2->pw_load( file => 't/data/raps2/test2' )->{extra},
-	'mextra', 'Extra for test2 loaded ok' );
-
-unlink('t/data/raps2/test1');
-unlink('t/data/raps2/test2');
-unlink('t/config/raps2/password');
diff --git a/t/29-app-raps2.t b/t/29-app-raps2.t
new file mode 100644
index 0000000..39d507d
--- /dev/null
+++ b/t/29-app-raps2.t
@@ -0,0 +1,56 @@
+#!/usr/bin/env perl
+use strict;
+use warnings;
+use 5.010;
+
+use Test::More tests => 10;
+
+$ENV{XDG_CONFIG_HOME} = 't/config';
+$ENV{XDG_DATA_HOME}   = 't/data';
+
+use_ok('App::Raps2');
+
+my $r2 = App::Raps2->new( master_password => 'sekrit', no_cli => 1 );
+isa_ok( $r2, 'App::Raps2' );
+
+ok( -e 't/config/raps2/password', 'config file created' );
+
+is_deeply(
+	$r2->file_to_hash('t/in/hash'),
+	{ key => 'value', otherkey => 'othervalue' },
+	'file_to_hash works',
+);
+
+$r2->pw_save(
+	password => 'foopass',
+	name     => 'test1'
+  ),
+
+  ok( -e 't/data/raps2/test1', 'Save password test1' );
+
+is( $r2->pw_load( name => 'test1' )->{password},
+	'foopass', 'Password for test1 loaded ok' );
+
+$r2->pw_save(
+	password => 'foopass',
+	file     => 't/data/raps2/test2',
+	url      => 'murl',
+	login    => 'mlogin',
+	extra    => 'mextra',
+  ),
+
+  is( $r2->pw_load_info( file => 't/data/raps2/test2' )->{url},
+	'murl', 'Password info loaded ok (url)' );
+
+is( $r2->pw_load_info( file => 't/data/raps2/test2' )->{login},
+	'mlogin', 'Password info loaded ok (login)' );
+
+is( $r2->pw_load( file => 't/data/raps2/test2' )->{password},
+	'foopass', 'Password for test2 loaded ok' );
+
+is( $r2->pw_load( file => 't/data/raps2/test2' )->{extra},
+	'mextra', 'Extra for test2 loaded ok' );
+
+unlink('t/data/raps2/test1');
+unlink('t/data/raps2/test2');
+unlink('t/config/raps2/password');
-- 
cgit v1.2.3