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=a5c5c1c8c0339e946d6b38e4ebda5e27be06bbc5;hp=b753e218118e730955cbe862f72267c3535ba361;hb=bf4f16438595386223595dd82ecde9efe8aca8fe;hpb=a82c96cf2bf688f97140bad7fd3979a531416a22

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index b753e21..a5c5c1c 100644
--- a/t/arg_constraints.t
+++ b/t/arg_constraints.t
@@ -58,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';
 
@@ -79,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');
@@ -104,12 +109,24 @@ BEGIN {
 
     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(Tuple[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 default :Default {
     my ($self, $c, $int) = @_;
@@ -152,11 +169,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';
 }
@@ -167,16 +179,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';
 }
@@ -229,4 +231,56 @@ SKIP: {
   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';
+}
+
+#{
+  # URI testing
+  #my ($res, $c) = ctx_request '/';
+
+
+#}
+
 done_testing;