X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Funit_load_catalyst_test.t;h=b8ec6793b4f0330143e21d10bc297619695a6544;hp=3c9eca9ee938dddda8d2e9e7d9e18b90d730d8ef;hb=269194b4f9de3905430a2d1f21f68da13b2b9ed9;hpb=c74d3f0cc6e5912895ffae0d0f11f45cd64f6676

diff --git a/t/unit_load_catalyst_test.t b/t/unit_load_catalyst_test.t
index 3c9eca9..b8ec679 100644
--- a/t/unit_load_catalyst_test.t
+++ b/t/unit_load_catalyst_test.t
@@ -3,22 +3,94 @@
 use strict;
 use warnings;
 
-use Test::More;
+use FindBin;
+use lib         "$FindBin::Bin/lib";
+use Test::More  tests => 56;
 use FindBin qw/$Bin/;
 use lib "$Bin/lib";
 use Catalyst::Utils;
 use HTTP::Request::Common;
 use Test::Exception;
 
-plan tests => 11;
+my $Class   = 'Catalyst::Test';
+my $App     = 'TestApp';
+my $Pkg     = __PACKAGE__;
+my $Url     = 'http://localhost/';
+my $Content = "root index";
 
-use_ok('Catalyst::Test');
+my %Meth    = (
+    $Pkg    => [qw|get request crequest|],          # exported
+    $Class  => [qw|local_request remote_request|],  # not exported
+);
 
-eval "get('http://localhost')";
-isnt( $@, "", "get returns an error message with no app specified");
+### make sure we're not trying to connect to a remote host -- these are local tests
+local $ENV{CATALYST_SERVER};                
 
-eval "request('http://localhost')";
-isnt( $@, "", "request returns an error message with no app specified");
+use_ok( $Class );
+
+### check available methods
+{   ### turn of redefine warnings, we'll get new subs exported
+    ### XXX 'no warnings' and 'local $^W' wont work as warnings are turned on in
+    ### test.pm, so trap them for now --kane
+    {   local $SIG{__WARN__} = sub {};
+        ok( $Class->import,     "Argumentless import for methods only" );
+    }
+
+    while( my($class, $meths) = each %Meth ) {
+        for my $meth ( @$meths ) { SKIP: {
+            
+            ### method available?
+            can_ok( $class,     $meth );
+
+            ### only for exported methods
+            skip "Error tests only for exported methods", 2 unless $class eq $Pkg;
+
+            ### check error conditions
+            eval { $class->can($meth)->( $Url ) };
+            ok( $@,             "   $meth without app gives error" );
+            like( $@, qr/$Class/, 
+                                "       Error filled with expected content for '$meth'" );
+        } }       
+    }
+}    
+ 
+### simple tests for exported methods 
+{   ### turn of redefine warnings, we'll get new subs exported
+    ### XXX 'no warnings' and 'local $^W' wont work as warnings are turned on in
+    ### test.pm, so trap them for now --kane
+    {   local $SIG{__WARN__} = sub {};
+        ok( $Class->import( $App ), 
+                                "Loading $Class for App $App" );
+    }
+    
+    ### test exported methods again
+    for my $meth ( @{ $Meth{$Pkg} } ) { SKIP: {
+
+        ### do a call, we should get a result and perhaps a $c if it's 'crequest';
+        my ($res, $c) = eval { $Pkg->can($meth)->( $Url ) };
+        
+        ok( 1,                  "   Called $Pkg->$meth( $Url )" );
+        ok( !$@,                "       No critical error $@" );
+        ok( $res,               "       Result obtained" );
+        
+        ### get the content as a string, to make sure we got what we expected
+        my $res_as_string = $meth eq 'get' ? $res : $res->content;
+        is( $res_as_string, $Content,
+                                "           Content as expected: $res_as_string" );    
+        
+        ### some tests for 'crequest'
+        skip "Context tests skipped for '$meth'", 6 unless $meth eq 'crequest';
+        
+        ok( $c,                 "           Context object returned" );
+        isa_ok( $c, $App,       "               Object" );
+        is( $c->request->uri, $Url,
+                                "               Url recorded in request" );
+        is( $c->response->body, $Content,
+                                "               Content recorded in response" );
+        ok( $c->stash,          "               Stash accessible" );
+        ok( $c->action,         "               Action object accessible" );
+    } }
+}
 
 # FIXME - These vhosts in tests tests should be somewhere else...
 
@@ -67,3 +139,4 @@ lives_ok {
 lives_ok {
     request(GET('/dummy'), []);
 } 'array additional param to request method ignored';
+