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=aabf1f42192c803b43925b4f667adffdf018818f;hp=57e972b38e61a4c05dc8e00e7566e01f765c605c;hb=79b7db20af61e914389b144e57bb7edfd107743c;hpb=480d94b5f34577816d44fe05389ca5a085179363

diff --git a/t/arg_constraints.t b/t/arg_constraints.t
index 57e972b..aabf1f4 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');
@@ -100,7 +105,7 @@ BEGIN {
 
   sub chain_base :Chained(/) CaptureArgs(1) { }
 
-    sub any_priority_chain :Chained(chain_base) PathPart('') Args(1) { $_[1]->res->body('any_priority_chain') }
+    sub any_priority_chain :GET 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') }
 
@@ -116,6 +121,22 @@ BEGIN {
 
       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 link2_int :Chained(link_tuple) PathPart('') CaptureArgs(UserId) { }
+
+        sub finally2 :GET Chained(link2_int) PathPart('') Args { $_[1]->res->body('finally2') }
+        sub finally :GET Chained(link2_int) PathPart('') Args(Int) { $_[1]->res->body('finally') }
 
   sub default :Default {
     my ($self, $c, $int) = @_;
@@ -158,11 +179,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';
 }
@@ -173,16 +189,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';
 }
@@ -245,4 +251,82 @@ SKIP: {
   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';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/6';
+  is $res->content, 'finally';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/a';
+  is $res->content, 'finally2';
+}
+
+{
+  my $res = request '/chain_base/1/2/3/3/3/6/7/8/9';
+  is $res->content, 'finally2';
+}
+
+=over
+
+| /chain_base/*/*/*/*/*/*                                     | /chain_base (1)                                             |
+|                                                             | -> /link_tuple (Tuple[Int,Int,Int])                         |
+|                                                             | -> /link2_int (UserId)                                      |
+|                                                             | => GET /finally (Int)  
+=cut
+
+{
+  # URI testing
+  my ($res, $c) = ctx_request '/';
+  ok my $url1 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5],6);
+  warn $url1;
+
+  ok my $url2 = $c->uri_for($c->controller('Root')->action_for('finally'), [1,2,3,4,5,6]);
+  warn $url2;
+}
+
 done_testing;