X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Flive%2Fcomponent%2Fcontroller%2Faction%2Fforward.t;h=db1c8eaf668c92ecd47d7f553d74e8cfe0112dd3;hp=6a991ee638f98aed307b3d45eed58bc31e6b6272;hb=46245bee79d81ab8b61245da76d103a9bcda9f00;hpb=40392ee98f45416e9b2fb18b80ea994dc1194d72

diff --git a/t/live/component/controller/action/forward.t b/t/live/component/controller/action/forward.t
index 6a991ee..db1c8ea 100644
--- a/t/live/component/controller/action/forward.t
+++ b/t/live/component/controller/action/forward.t
@@ -6,124 +6,220 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 30;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 44 * $iters;
 use Catalyst::Test 'TestApp';
 
-{
-    my @expected = qw[
-      TestApp::Controller::Action::Forward->begin
-      TestApp::Controller::Action::Forward->one
-      TestApp::Controller::Action::Forward->two
-      TestApp::Controller::Action::Forward->three
-      TestApp::Controller::Action::Forward->four
-      TestApp::Controller::Action::Forward->five
-      TestApp::View::Dump::Request->process
-    ];
-
-    my $expected = join( ", ", @expected );
-
-    # Test forward to global private action
-    ok( my $response = request('http://localhost/action/forward/global'),
-        'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    is( $response->header('X-Catalyst-Action'),
-        'action/forward/global', 'Main Class Action' );
-
-    # Test forward to chain of actions.
-    ok( $response = request('http://localhost/action/forward/one'), 'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    is( $response->header('X-Catalyst-Action'),
-        'action/forward/one', 'Test Action' );
-    is(
-        $response->header('X-Test-Class'),
-        'TestApp::Controller::Action::Forward',
-        'Test Class'
-    );
-    is( $response->header('X-Catalyst-Executed'),
-        $expected, 'Executed actions' );
-    like(
-        $response->content,
-        qr/^bless\( .* 'Catalyst::Request' \)$/s,
-        'Content is a serialized Catalyst::Request'
-    );
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( $iters, \&run_tests );
 }
-
-{
-    my @expected = qw[
-      TestApp::Controller::Action::Forward->begin
-      TestApp::Controller::Action::Forward->jojo
-      TestApp::Controller::Action::Forward->one
-      TestApp::Controller::Action::Forward->two
-      TestApp::Controller::Action::Forward->three
-      TestApp::Controller::Action::Forward->four
-      TestApp::Controller::Action::Forward->five
-      TestApp::View::Dump::Request->process
-      TestApp::Controller::Action::Forward->three
-      TestApp::Controller::Action::Forward->four
-      TestApp::Controller::Action::Forward->five
-      TestApp::View::Dump::Request->process
-    ];
-
-    my $expected = join( ", ", @expected );
-
-    ok( my $response = request('http://localhost/action/forward/jojo'),
-        'Request' );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content_type, 'text/plain', 'Response Content-Type' );
-    is( $response->header('X-Catalyst-Action'),
-        'action/forward/jojo', 'Test Action' );
-    is(
-        $response->header('X-Test-Class'),
-        'TestApp::Controller::Action::Forward',
-        'Test Class'
-    );
-    is( $response->header('X-Catalyst-Executed'),
-        $expected, 'Executed actions' );
-    like(
-        $response->content,
-        qr/^bless\( .* 'Catalyst::Request' \)$/s,
-        'Content is a serialized Catalyst::Request'
-    );
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
 }
 
-{
-    ok(
-        my $response = request('http://localhost/action/forward/with_args/old'),
-        'Request with args'
-    );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content, 'old' );
-}
+sub run_tests {
+    {
+        my @expected = qw[
+          TestApp::Controller::Action::Forward->begin
+          TestApp::Controller::Action::Forward->one
+          TestApp::Controller::Action::Forward->two
+          TestApp::Controller::Action::Forward->three
+          TestApp::Controller::Action::Forward->four
+          TestApp::Controller::Action::Forward->five
+          TestApp::View::Dump::Request->process
+          TestApp->end
+        ];
 
-{
-    ok(
-        my $response =
-          request('http://localhost/action/forward/with_method_and_args/old'),
-        'Request with args and method'
-    );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content, 'old' );
-}
+        my $expected = join( ", ", @expected );
 
-# test forward with embedded args
-{
-    ok(
-        my $response =
-          request('http://localhost/action/forward/args_embed_relative'),
-        'Request'
-    );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content, 'ok' );
-}
+        # Test forward to global private action
+        ok( my $response = request('http://localhost/action/forward/global'),
+            'Request' );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content_type, 'text/plain', 'Response Content-Type' );
+        is( $response->header('X-Catalyst-Action'),
+            'action/forward/global', 'Main Class Action' );
+
+        # Test forward to chain of actions.
+        ok( $response = request('http://localhost/action/forward/one'),
+            'Request' );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content_type, 'text/plain', 'Response Content-Type' );
+        is( $response->header('X-Catalyst-Action'),
+            'action/forward/one', 'Test Action' );
+        is(
+            $response->header('X-Test-Class'),
+            'TestApp::Controller::Action::Forward',
+            'Test Class'
+        );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        like(
+            $response->content,
+            qr/^bless\( .* 'Catalyst::Request' \)$/s,
+            'Content is a serialized Catalyst::Request'
+        );
+    }
+
+    {
+        my @expected = qw[
+          TestApp::Controller::Action::Forward->begin
+          TestApp::Controller::Action::Forward->jojo
+          TestApp::Controller::Action::Forward->one
+          TestApp::Controller::Action::Forward->two
+          TestApp::Controller::Action::Forward->three
+          TestApp::Controller::Action::Forward->four
+          TestApp::Controller::Action::Forward->five
+          TestApp::View::Dump::Request->process
+          TestApp::Controller::Action::Forward->three
+          TestApp::Controller::Action::Forward->four
+          TestApp::Controller::Action::Forward->five
+          TestApp::View::Dump::Request->process
+          TestApp->end
+        ];
+
+        my $expected = join( ", ", @expected );
+
+        ok( my $response = request('http://localhost/action/forward/jojo'),
+            'Request' );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content_type, 'text/plain', 'Response Content-Type' );
+        is( $response->header('X-Catalyst-Action'),
+            'action/forward/jojo', 'Test Action' );
+        is(
+            $response->header('X-Test-Class'),
+            'TestApp::Controller::Action::Forward',
+            'Test Class'
+        );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        like(
+            $response->content,
+            qr/^bless\( .* 'Catalyst::Request' \)$/s,
+            'Content is a serialized Catalyst::Request'
+        );
+    }
+
+    {
+        ok(
+            my $response =
+              request('http://localhost/action/forward/with_args/old'),
+            'Request with args'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content, 'old' );
+    }
+
+    {
+        ok(
+            my $response = request(
+                'http://localhost/action/forward/with_method_and_args/old'),
+            'Request with args and method'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content, 'old' );
+    }
+
+    # test forward with embedded args
+    {
+        ok(
+            my $response =
+              request('http://localhost/action/forward/args_embed_relative'),
+            'Request'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content, 'ok' );
+    }
+
+    {
+        ok(
+            my $response =
+              request('http://localhost/action/forward/args_embed_absolute'),
+            'Request'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content, 'ok' );
+    }
+    {
+        my @expected = qw[
+          TestApp::Controller::Action::Relative->begin
+          TestApp::Controller::Action::Relative->relative
+          TestApp::Controller::Action::Forward->one
+          TestApp::Controller::Action::Forward->two
+          TestApp::Controller::Action::Forward->three
+          TestApp::Controller::Action::Forward->four
+          TestApp::Controller::Action::Forward->five
+          TestApp::View::Dump::Request->process
+          TestApp->end
+        ];
+
+        my $expected = join( ", ", @expected );
+
+        # Test forward to chain of actions.
+        ok( my $response = request('http://localhost/action/relative/relative'),
+            'Request' );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content_type, 'text/plain', 'Response Content-Type' );
+        is( $response->header('X-Catalyst-Action'),
+            'action/relative/relative', 'Test Action' );
+        is(
+            $response->header('X-Test-Class'),
+            'TestApp::Controller::Action::Relative',
+            'Test Class'
+        );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        like(
+            $response->content,
+            qr/^bless\( .* 'Catalyst::Request' \)$/s,
+            'Content is a serialized Catalyst::Request'
+        );
+    }
+    {
+        my @expected = qw[
+          TestApp::Controller::Action::Relative->begin
+          TestApp::Controller::Action::Relative->relative_two
+          TestApp::Controller::Action::Forward->one
+          TestApp::Controller::Action::Forward->two
+          TestApp::Controller::Action::Forward->three
+          TestApp::Controller::Action::Forward->four
+          TestApp::Controller::Action::Forward->five
+          TestApp::View::Dump::Request->process
+          TestApp->end
+        ];
+
+        my $expected = join( ", ", @expected );
 
-{
-    ok(
-        my $response =
-          request('http://localhost/action/forward/args_embed_absolute'),
-        'Request'
-    );
-    ok( $response->is_success, 'Response Successful 2xx' );
-    is( $response->content, 'ok' );
+        # Test forward to chain of actions.
+        ok(
+            my $response =
+              request('http://localhost/action/relative/relative_two'),
+            'Request'
+        );
+        ok( $response->is_success, 'Response Successful 2xx' );
+        is( $response->content_type, 'text/plain', 'Response Content-Type' );
+        is(
+            $response->header('X-Catalyst-Action'),
+            'action/relative/relative_two',
+            'Test Action'
+        );
+        is(
+            $response->header('X-Test-Class'),
+            'TestApp::Controller::Action::Relative',
+            'Test Class'
+        );
+        is( $response->header('X-Catalyst-Executed'),
+            $expected, 'Executed actions' );
+        like(
+            $response->content,
+            qr/^bless\( .* 'Catalyst::Request' \)$/s,
+            'Content is a serialized Catalyst::Request'
+        );
+    }
 }