X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F001_basic.t;h=1be95175c7c0ae02284db4aa6add2c49b7c4cb53;hb=HEAD;hp=a8aff2269a2e7a74c03e5c959385877d55689e7d;hpb=fe1bfe7d50bcca90a8e2dc1e62d142b093bfbd6e;p=catagits%2FWeb-Session.git

diff --git a/t/001_basic.t b/t/001_basic.t
index a8aff22..1be9517 100755
--- a/t/001_basic.t
+++ b/t/001_basic.t
@@ -4,206 +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 @sids;
-{
-    my $r = request();
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    push @sids, $s->id;
-    
-    ok(!$s->get('foo'), '... no value stored in foo for session');
-
-    lives_ok {
-        $s->set( foo => 'bar' );
-    } '... set the value successfully in session';
-
-    is($s->get('foo'), 'bar', '... got the foo value back successfully from session');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized sessio successfully';
-}
-
-{
-    my $r = request();
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    push @sids, $s->id;
-
-    isnt($sids[0], $sids[1], "no same Session ID");
-    ok(!$s->get('foo'), '... no value stored for foo in session');
-
-    lives_ok {
-        $s->set( foo => 'baz' );
-    } '... set the value successfully';
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session successfully';
-}
-
-{
-    my $r = request({ plack_session => $sids[0] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, $sids[0], '... got a basic session id');
-
-    is($s->get('foo'), 'bar', '... got the value for foo back successfully from session');
-
-    lives_ok {
-        $s->remove( 'foo' );
-    } '... removed the foo value successfully from session';
-
-    ok(!$s->get('foo'), '... no value stored for foo in session');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session successfully';
-}
-
-
-{
-    my $r = request({ plack_session => $sids[1] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, $sids[1], '... got a basic session id');
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session successfully';
-}
-
-{
-    my $r = request({ plack_session => $sids[0] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, $sids[0], '... got a basic session id');
-
-    ok(!$s->get('foo'), '... no value stored for foo in session');
-
-    lives_ok {
-        $s->set( bar => 'baz' );
-    } '... set the bar value successfully in session';
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session successfully';
-}
-
-{
-    my $r = request({ plack_session => $sids[0] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->get('bar'), 'baz', '... got the bar value back successfully from session');
-
-    lives_ok {
-        $s->expire;
-    } '... expired session successfully';
-}
-
-{
-    my $r = request({ plack_session => $sids[0] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    push @sids, $s->id;
-    isnt($s->id, $sids[0], 'expired ... got a new session id');
-
-    ok(!$s->get('bar'), '... no bar value stored');
-}
-
-{
-    my $r = request({ plack_session => $sids[1] });
-
-    my $s = Plack::Session->new(
-        state   => $state,
-        store   => $storage,
-        request => $r,
-    );
-
-    is($s->id, $sids[1], '... got a basic session id');
-
-    is($s->get('foo'), 'baz', '... got the foo value back successfully from session');
-
-    my $resp = $r->new_response;
-
-    lives_ok {
-        $s->finalize( $resp );
-    } '... finalized session successfully';
-}
+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;