Merge pull request #7 from tokuhirom/master

[catagits/Web-Session.git] / t / 001_basic.t

diff --git a/t/001_basic.t b/t/001_basic.t
old mode 100644 (file)
new mode 100755 (executable)
index 3291b5c..1be9517
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -4,205 +4,29 @@ use strict;
 use warnings;
 
 use Test::More;
-use Test::Exception;
 
 use Plack::Request;
-
 use Plack::Session;
 use Plack::Session::State;
 use Plack::Session::Store;
 
-sub request {
-    open my $in, '<', \do { my $d };
-    my $env = {
-        'psgi.version'    => [ 1, 0 ],
-        'psgi.input'      => $in,
-        'psgi.errors'     => *STDERR,
-        'psgi.url_scheme' => 'http',
-        SERVER_PORT       => 80,
-        REQUEST_METHOD    => 'GET',
-    };
-    my $r = Plack::Request->new( $env );
-    $r->parameters( @_ );
-    $r;
-}
-
-my $storage = Plack::Session::Store->new;
-my $state   = Plack::Session::State->new;
-
-{
-    my $r = request();
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 1, '... got a basic session id (1)');
-
-    ok(!$s->get('foo'), '... no value stored in foo for session (1)');
-
-    lives_ok {
-        $s->set( foo => 'bar' );
-    } '... set the value successfully in session (1)';
-
-    is($s->get('foo'), 'bar', '... got the foo value back successfully from session (1)');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (1) successfully';
-}
-
-{
-    my $r = request();
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 2, '... got a basic session id (2)');
-
-    ok(!$s->get('foo'), '... no value stored for foo in session (2)');
-
-    lives_ok {
-        $s->set( foo => 'baz' );
-    } '... set the value successfully';
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session (2)');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (2) successfully';
-}
-
-{
-    my $r = request({ plack_session => 1 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 1, '... got a basic session id (1)');
-
-    is($s->get('foo'), 'bar', '... got the value for foo back successfully from session (1)');
-
-    lives_ok {
-        $s->remove( 'foo' );
-    } '... removed the foo value successfully from session (1)';
-
-    ok(!$s->get('foo'), '... no value stored for foo in session (1)');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (1) successfully';
-}
-
-
-{
-    my $r = request({ plack_session => 2 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 2, '... got a basic session id (2)');
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session (2)');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (2) successfully';
-}
-
-{
-    my $r = request({ plack_session => 1 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 1, '... got a basic session id (1)');
-
-    ok(!$s->get('foo'), '... no value stored for foo in session (1)');
-
-    lives_ok {
-        $s->set( bar => 'baz' );
-    } '... set the bar value successfully in session (1)';
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (1) successfully';
-}
-
-{
-    my $r = request({ plack_session => 1 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 1, '... got a basic session id (1)');
-
-    is($s->get('bar'), 'baz', '... got the bar value back successfully from session (1)');
-
-    lives_ok {
-        $s->expire;
-    } '... expired session (1) successfully';
-}
-
-{
-    my $r = request({ plack_session => 1 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 3, '... got a new session id (3)');
-
-    ok(!$s->get('bar'), '... no bar value stored (from session (1)) in session (3)');
-}
-
-{
-    my $r = request({ plack_session => 2 });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, 2, '... got a basic session id (2)');
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session (2)');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session (2) successfully';
-}
-
-done_testing;
\ No newline at end of file
+use t::lib::TestSession;
+
+t::lib::TestSession::run_all_tests(
+    store  => Plack::Session::Store->new,
+    state  => Plack::Session::State->new,
+    env_cb => sub {
+        open my $in, '<', \do { my $d };
+        my $env = {
+            'psgi.version'    => [ 1, 0 ],
+            'psgi.input'      => $in,
+            'psgi.errors'     => *STDERR,
+            'psgi.url_scheme' => 'http',
+            SERVER_PORT       => 80,
+            REQUEST_METHOD    => 'GET',
+            QUERY_STRING      => join "&" => map { $_ . "=" . $_[0]->{ $_ } } keys %{$_[0] || +{}},
+        };
+    },
+);
+
+done_testing;