- Updates action tests to use CAT_BENCH_ITERS or 2 for num. iterations

diff --git a/t/live/component/controller/action/auto.t b/t/live/component/controller/action/auto.t
index e38e568..acc3ca7 100644 (file)
--- a/t/live/component/controller/action/auto.t
+++ b/t/live/component/controller/action/auto.t
@@ -6,12 +6,16 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 180;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 18*$iters;
 use Catalyst::Test 'TestApp';
 
 if ( $ENV{CAT_BENCHMARK} ) {
     require Benchmark;
-    Benchmark::timethis( -10, \&run_tests );
+    Benchmark::timethis( $iters, \&run_tests );
     
     # new dispatcher:
     # 11 wallclock secs (10.14 usr +  0.20 sys = 10.34 CPU) @ 15.18/s (n=157)
@@ -19,7 +23,7 @@ if ( $ENV{CAT_BENCHMARK} ) {
     # 11 wallclock secs (10.34 usr +  0.20 sys = 10.54 CPU) @ 13.76/s (n=145)
 }
 else {
-    for ( 1 .. 10 ) {
+    for ( 1 .. $iters ) {
         run_tests();
     }
 }

diff --git a/t/live/component/controller/action/begin.t b/t/live/component/controller/action/begin.t
index 144d929..94f28fd 100644 (file)
--- a/t/live/component/controller/action/begin.t
+++ b/t/live/component/controller/action/begin.t
@@ -6,10 +6,25 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 70;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 7*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
+
     {
         my @expected = qw[
           TestApp::Controller::Action::Begin->begin

diff --git a/t/live/component/controller/action/default.t b/t/live/component/controller/action/default.t
index 0354c95..810c3e8 100644 (file)
--- a/t/live/component/controller/action/default.t
+++ b/t/live/component/controller/action/default.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 120;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 12*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         my @expected = qw[
           TestApp::Controller::Action::Default->begin

diff --git a/t/live/component/controller/action/detach.t b/t/live/component/controller/action/detach.t
index 7ea99b4..f833346 100644 (file)
--- a/t/live/component/controller/action/detach.t
+++ b/t/live/component/controller/action/detach.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;\r
 use lib "$FindBin::Bin/../../../lib";\r
 \r
-use Test::More tests => 180;\r
+our $iters;\r
+\r
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }\r
+\r
+use Test::More tests => 18*$iters;\r
 use Catalyst::Test 'TestApp';\r
 \r
-for ( 1 .. 10 ) {\r
+if ( $ENV{CAT_BENCHMARK} ) {\r
+    require Benchmark;\r
+    Benchmark::timethis( -$iters, \&run_tests );\r
+}\r
+else {\r
+    for ( 1 .. $iters ) {\r
+        run_tests();\r
+    }\r
+}\r
+\r
+sub run_tests {\r
     {\r
         my @expected = qw[\r
           TestApp::Controller::Action::Detach->begin\r

diff --git a/t/live/component/controller/action/end.t b/t/live/component/controller/action/end.t
index 9042df2..e100e7a 100644 (file)
--- a/t/live/component/controller/action/end.t
+++ b/t/live/component/controller/action/end.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 70;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 7*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         my @expected = qw[
           TestApp::Controller::Action::End->begin

diff --git a/t/live/component/controller/action/forward.t b/t/live/component/controller/action/forward.t
index 1b7b9be..cf448bd 100644 (file)
--- a/t/live/component/controller/action/forward.t
+++ b/t/live/component/controller/action/forward.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 300;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 30*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         my @expected = qw[
           TestApp::Controller::Action::Forward->begin

diff --git a/t/live/component/controller/action/global.t b/t/live/component/controller/action/global.t
index 44aad6d..b33e279 100644 (file)
--- a/t/live/component/controller/action/global.t
+++ b/t/live/component/controller/action/global.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 180;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 18*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         ok( my $response = request('http://localhost/action_global_one'),
             'Request' );

diff --git a/t/live/component/controller/action/index.t b/t/live/component/controller/action/index.t
index 6e44b21..a7136ec 100644 (file)
--- a/t/live/component/controller/action/index.t
+++ b/t/live/component/controller/action/index.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 19;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 19*$iters;
 use Catalyst::Test 'TestApp';
-    
-for ( 1 .. 1 ) {
+
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     # test root index
     {
         ok( my $response = request('http://localhost/'), 'root index' );

diff --git a/t/live/component/controller/action/inheritance.t b/t/live/component/controller/action/inheritance.t
index c6a8e89..4845d62 100644 (file)
--- a/t/live/component/controller/action/inheritance.t
+++ b/t/live/component/controller/action/inheritance.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 210;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 21*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         my @expected = qw[
           TestApp::Controller::Action::Inheritance->begin

diff --git a/t/live/component/controller/action/local.t b/t/live/component/controller/action/local.t
index 47e872e..9c2f69e 100644 (file)
--- a/t/live/component/controller/action/local.t
+++ b/t/live/component/controller/action/local.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 240;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 24*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         ok( my $response = request('http://localhost/action/local/one'),
             'Request' );

diff --git a/t/live/component/controller/action/multipath.t b/t/live/component/controller/action/multipath.t
index a5edae0..2bc9849 100644 (file)
--- a/t/live/component/controller/action/multipath.t
+++ b/t/live/component/controller/action/multipath.t
@@ -6,16 +6,29 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 160;
-use Catalyst::Test 'TestApp';
-
 my $content = q/foo
 bar
 baz
 /;
 
-for ( 1 .. 10 ) {
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 16*$iters;
+use Catalyst::Test 'TestApp';
+
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
 
+sub run_tests {
     # Local
     {
         ok(

diff --git a/t/live/component/controller/action/path.t b/t/live/component/controller/action/path.t
index 643b9ce..751aaa0 100644 (file)
--- a/t/live/component/controller/action/path.t
+++ b/t/live/component/controller/action/path.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 120;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 12*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         ok(
             my $response =

diff --git a/t/live/component/controller/action/private.t b/t/live/component/controller/action/private.t
index fda96ea..4d07372 100644 (file)
--- a/t/live/component/controller/action/private.t
+++ b/t/live/component/controller/action/private.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 240;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 24*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         ok( my $response = request('http://localhost/action/private/one'),
             'Request' );

diff --git a/t/live/component/controller/action/regexp.t b/t/live/component/controller/action/regexp.t
index ced2ac1..954745e 100644 (file)
--- a/t/live/component/controller/action/regexp.t
+++ b/t/live/component/controller/action/regexp.t
@@ -6,10 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 120;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 12*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
+
+sub run_tests {
     {
         ok( my $response = request('http://localhost/action/regexp/10/hello'),
             'Request' );

diff --git a/t/live/component/controller/action/streaming.t b/t/live/component/controller/action/streaming.t
index 192e4de..c1f4fb6 100644 (file)
--- a/t/live/component/controller/action/streaming.t
+++ b/t/live/component/controller/action/streaming.t
@@ -6,11 +6,24 @@ use warnings;
 use FindBin;
 use lib "$FindBin::Bin/../../../lib";
 
-use Test::More tests => 80;
+our $iters;
+
+BEGIN { $iters = $ENV{CAT_BENCH_ITERS} || 2; }
+
+use Test::More tests => 8*$iters;
 use Catalyst::Test 'TestApp';
 
-for ( 1 .. 10 ) {
+if ( $ENV{CAT_BENCHMARK} ) {
+    require Benchmark;
+    Benchmark::timethis( -$iters, \&run_tests );
+}
+else {
+    for ( 1 .. $iters ) {
+        run_tests();
+    }
+}
 
+sub run_tests {
     # test direct streaming
     {
         ok( my $response = request('http://localhost/streaming'), 'Request' );