X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=t%2Farg_constraints.t;h=62571ceebe50bd83f05d2ee1626db31e19aeef15;hp=fae6bc6e5ddc4646aa4a946e81039f7bee0c779d;hb=677c155cd86bbbea0cbe6a9b40a9b4c24b89ee9d;hpb=5d198e3f95611ce91aef8c400db4c73cbc471d7c

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index fae6bc6..62571ce 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -28,6 +28,7 @@ BEGIN {
    as Int,
    where { $_ < 5 };
 
+  # Tests using this are skipped pending deeper thought
   coerce User,
    from ContextLike,
      via { $_->model('User')->find( $_->req->args->[0] ) };
@@ -57,7 +58,7 @@ BEGIN {
 
   use Moose;
   use MooseX::MethodAttributes;
-  use MyApp::Types qw/Tuple Int Str StrMatch UserId User/;
+  use MyApp::Types qw/Tuple Int Str StrMatch ArrayRef UserId User/;
 
   extends 'Catalyst::Controller';
 
@@ -67,6 +68,7 @@ BEGIN {
     $c->res->body("name: $user->{name}, age: $user->{age}");
   }
 
+  # Tests using this are current skipped pending coercion rethink
   sub user_object :Local Args(User) Coerce(1) {
     my ($self, $c, $user) = @_;
     $c->res->body("name: $user->{name}, age: $user->{age}");
@@ -77,6 +79,11 @@ BEGIN {
     $c->res->body('an_int');
   }
 
+  sub two_ints :Local Args(Int,Int) {
+    my ($self, $c, $int) = @_;
+    $c->res->body('two_ints');
+  }
+
   sub many_ints :Local Args(ArrayRef[Int]) {
     my ($self, $c, $int) = @_;
     $c->res->body('many_ints');
@@ -91,10 +98,42 @@ BEGIN {
     my ($self, $c, $int) = @_;
     $c->res->body('match');
   }
+
   sub any_priority :Path('priority_test') Args(1) { $_[1]->res->body('any_priority') }
 
   sub int_priority :Path('priority_test') Args(Int) { $_[1]->res->body('int_priority') }
 
+  sub chain_base :Chained(/) CaptureArgs(1) { }
+
+    sub any_priority_chain :Chained(chain_base) PathPart('') Args(1) { $_[1]->res->body('any_priority_chain') }
+
+    sub int_priority_chain :Chained(chain_base) PathPart('') Args(Int) { $_[1]->res->body('int_priority_chain') }
+
+    sub link_any :Chained(chain_base) PathPart('') CaptureArgs(1) { }
+
+      sub any_priority_link_any :Chained(link_any) PathPart('') Args(1) { $_[1]->res->body('any_priority_link_any') }
+
+      sub int_priority_link_any :Chained(link_any) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link_any') }
+    
+    sub link_int :Chained(chain_base) PathPart('') CaptureArgs(Int) { }
+
+      sub any_priority_link :Chained(link_int) PathPart('') Args(1) { $_[1]->res->body('any_priority_link') }
+
+      sub int_priority_link :Chained(link_int) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link') }
+
+    sub link_int_int :Chained(chain_base) PathPart('') CaptureArgs(Int,Int) { }
+
+      sub any_priority_link2 :Chained(link_int_int) PathPart('') Args(1) { $_[1]->res->body('any_priority_link2') }
+
+      sub int_priority_link2 :Chained(link_int_int) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link2') }
+
+    sub link_tuple :Chained(chain_base) PathPart('') CaptureArgs(Tuple[Int,Int,Int]) { }
+
+      sub any_priority_link3 :Chained(link_tuple) PathPart('') Args(1) { $_[1]->res->body('any_priority_link3') }
+
+      sub int_priority_link3 :Chained(link_tuple) PathPart('') Args(Int) { $_[1]->res->body('int_priority_link3') }
+
+
   sub default :Default {
     my ($self, $c, $int) = @_;
     $c->res->body('default');
@@ -136,11 +175,6 @@ use Catalyst::Test 'MyApp';
 }
 
 {
-  my $res = request '/many_ints/1/2/a';
-  is $res->content, 'default';
-}
-
-{
   my $res = request '/priority_test/1';
   is $res->content, 'int_priority';
 }
@@ -151,16 +185,6 @@ use Catalyst::Test 'MyApp';
 }
 
 {
-  my $res = request '/tuple/aaa/111';
-  is $res->content, 'tuple';
-}
-
-{
-  my $res = request '/tuple/aaa/aaa';
-  is $res->content, 'default';
-}
-
-{
   my $res = request '/match/11-22-33';
   is $res->content, 'match';
 }
@@ -180,14 +204,99 @@ use Catalyst::Test 'MyApp';
   is $res->content, 'default';
 }
 
-{
+
+SKIP: {
+  skip "coercion support needs more thought", 1;
   my $res = request '/user_object/20';
   is $res->content, 'default';
 }
 
-{
+SKIP: {
+  skip "coercion support needs more thought", 1;
   my $res = request '/user_object/2';
   is $res->content, 'name: mary, age: 36';
 }
 
+{
+  my $res = request '/chain_base/capture/arg';
+  is $res->content, 'any_priority_chain';
+}
+
+{
+  my $res = request '/chain_base/cap1/100/arg';
+  is $res->content, 'any_priority_link';
+}
+
+{
+  my $res = request '/chain_base/cap1/101/102';
+  is $res->content, 'int_priority_link';
+}
+
+{
+  my $res = request '/chain_base/capture/100';
+  is $res->content, 'int_priority_chain', 'got expected';
+}
+
+{
+  my $res = request '/chain_base/cap1/a/arg';
+  is $res->content, 'any_priority_link_any';
+}
+
+{
+  my $res = request '/chain_base/cap1/a/102';
+  is $res->content, 'int_priority_link_any';
+}
+
+{
+  my $res = request '/two_ints/1/2';
+  is $res->content, 'two_ints';
+}
+
+{
+  my $res = request '/two_ints/aa/111';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/tuple/aaa/aaa';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/tuple/aaa/111';
+  is $res->content, 'tuple';
+}
+
+{
+  my $res = request '/many_ints/1/2/a';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/chain_base/100/100/100/100';
+  is $res->content, 'int_priority_link2';
+}
+
+{
+  my $res = request '/chain_base/100/ss/100/100';
+  is $res->content, 'default';
+}
+
+{
+  my $res = request '/chain_base/100/100/100/100/100';
+  is $res->content, 'int_priority_link3';
+}
+
+{
+  my $res = request '/chain_base/100/ss/100/100/100';
+  is $res->content, 'default';
+}
+
+#{
+  # URI testing
+  #my ($res, $c) = ctx_request '/';
+
+
+#}
+
 done_testing;