X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Flib%2FTestApp.pm;h=9d4ab50f8a11caf6d71257cbdc0b7200e066e21b;hb=0a2c51b79f14fb8e51701bacf600c2160b1aff52;hp=d903b3c4a28ab3cb9b03a23c9e0270767221602f;hpb=7289922b016e36af1b5a9e656fe4b8fa776180e9;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/lib/TestApp.pm b/t/lib/TestApp.pm
index d903b3c..9d4ab50 100644
--- a/t/lib/TestApp.pm
+++ b/t/lib/TestApp.pm
@@ -2,101 +2,120 @@ package TestApp;
 
 use strict;
 use Catalyst qw/
+    Test::MangleDollarUnderScore
     Test::Errors 
-    Test::Headers 
     Test::Plugin
     Test::Inline
     +TestApp::Plugin::FullyQualified
+    +TestApp::Plugin::AddDispatchTypes
+    +TestApp::Role
 /;
 use Catalyst::Utils;
 
+use Moose;
+use namespace::autoclean;
+
 our $VERSION = '0.01';
 
 TestApp->config( name => 'TestApp', root => '/some/dir' );
 
-unless (eval 'require Moose; 1') {
-    TestApp->config(setup_components => { except => 'TestApp::Controller::Moose' });
-}
-
-TestApp->setup;
+if (eval { Class::MOP::load_class('CatalystX::LeakChecker'); 1 }) {
+#    with 'CatalystX::LeakChecker';   # LeakChecker dose not work yet with Catalyst::Context - zby
 
-sub index : Private {
-    my ( $self, $c ) = @_;
-    $c->res->body('root index');
+    has leaks => (
+        is      => 'ro',
+        default => sub { [] },
+    );
 }
 
-sub global_action : Private {
-    my ( $self, $c ) = @_;
-    $c->forward('TestApp::View::Dump::Request');
+sub found_leaks {
+    my ($ctx, @leaks) = @_;
+    push @{ $ctx->leaks }, @leaks;
 }
 
-sub execute {
-    my $c      = shift;
-    my $class  = ref( $c->component( $_[0] ) ) || $_[0];
-    my $action = "$_[1]";
-
-    my $method;
+sub count_leaks {
+    my ($ctx) = @_;
+    return scalar @{ $ctx->leaks };
+}
 
-    if ( $action =~ /->(\w+)$/ ) {
-        $method = $1;
-    }
-    elsif ( $action =~ /\/(\w+)$/ ) {
-        $method = $1;
-    }
-    elsif ( $action =~ /^(\w+)$/ ) {
-        $method = $action;
-    }
+TestApp->context_class( 'TestApp::Context' );
+TestApp->setup;
 
-    if ( $class && $method && $method !~ /^_/ ) {
-        my $executed = sprintf( "%s->%s", $class, $method );
-        my @executed = $c->response->headers->header('X-Catalyst-Executed');
-        push @executed, $executed;
-        $c->response->headers->header(
-            'X-Catalyst-Executed' => join ', ',
-            @executed
-        );
-    }
+around prepare => sub {
+    my $orig = shift;
+    my $self = shift;
 
-    return $c->SUPER::execute(@_);
-}
+    my $c = $self->$orig(@_);
 
-# Replace the very large HTML error page with
-# useful info if something crashes during a test
-sub finalize_error {
-    my $c = shift;
+    $c->response->header( 'X-Catalyst-Engine' => $c->engine );
+    $c->response->header( 'X-Catalyst-Debug' => $c->debug ? 1 : 0 );
     
-    $c->NEXT::finalize_error(@_);
-    
-    $c->res->status(500);
-    $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
-}
+    {
+        my $components = join( ', ', sort keys %{ $c->components } );
+        $c->response->header( 'X-Catalyst-Components' => $components );
+    }
 
-sub class_forward_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Forward-Test-Method' => 1 );
-}
+    {
+        no strict 'refs';
+        my $plugins = join ', ', $self->registered_plugins;
+        $c->response->header( 'X-Catalyst-Plugins' => $plugins );
+    }
 
-sub class_go_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Go-Test-Method' => 1 );
-}
+    return $c;
+};
 
-sub class_visit_test_method :Private {
-    my ( $self, $c ) = @_;
-    $c->response->headers->header( 'X-Class-Visit-Test-Method' => 1 );
-}
 
-sub loop_test : Local {
-    my ( $self, $c ) = @_;
+{
+    package TestApp::Context;
+    use Moose;
+    extends 'Catalyst::Context';
+    
+    sub execute {
+        my $c      = shift;
+        my $class  = ref( $c->component( $_[0] ) ) || $_[0];
+        my $action = $_[1]->reverse;
+
+        my $method;
+
+        if ( $action =~ /->(\w+)$/ ) {
+            $method = $1;
+        }
+        elsif ( $action =~ /\/(\w+)$/ ) {
+            $method = $1;
+        }
+        elsif ( $action =~ /^(\w+)$/ ) {
+            $method = $action;
+        }
+
+        if ( $class && $method && $method !~ /^_/ ) {
+            my $executed = sprintf( "%s->%s", $class, $method );
+            my @executed = $c->response->headers->header('X-Catalyst-Executed');
+            push @executed, $executed;
+            $c->response->headers->header(
+                'X-Catalyst-Executed' => join ', ',
+                @executed
+            );
+        }
+        no warnings 'recursion';
+        return $c->SUPER::execute(@_);
+    }
 
-    for( 1..1001 ) {
-        $c->forward( 'class_forward_test_method' );
+    # Replace the very large HTML error page with
+    # useful info if something crashes during a test
+    sub finalize_error {
+        my $c = shift;
+        
+        $c->next::method(@_);
+        
+        $c->res->status(500);
+        $c->res->body( 'FATAL ERROR: ' . join( ', ', @{ $c->error } ) );
     }
-}
 
-sub recursion_test : Local {
-    my ( $self, $c ) = @_;
-    $c->forward( 'recursion_test' );
+    after prepare_action => sub{
+        my $c = shift;
+        $c->res->header( 'X-Catalyst-Action' => $c->req->action );
+    };
+
 }
 
 {
@@ -110,6 +129,6 @@ package Catalyst::Plugin::Test::Inline;
 
 use strict;
 
-use base qw/Catalyst::Base Class::Data::Inheritable/;
+use base qw/Class::Data::Inheritable/;
 
 1;