X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Funit_core_uri_for.t;h=24b18f856de77cc0bfa15c1dd50786e457df6bc1;hb=cb689891b91e9343d8d3784908f73d68b9933e05;hp=e159a7ba5b493a3cfd656984299ea8e1cecb0f4a;hpb=0a2c51b79f14fb8e51701bacf600c2160b1aff52;p=catagits%2FCatalyst-Runtime.git

diff --git a/t/unit_core_uri_for.t b/t/unit_core_uri_for.t
index e159a7b..24b18f8 100644
--- a/t/unit_core_uri_for.t
+++ b/t/unit_core_uri_for.t
@@ -10,67 +10,65 @@ my $request = Catalyst::Request->new( {
                 base => URI->new('http://127.0.0.1/foo')
               } );
 
-my $context = Catalyst->new( {
-                context => Catalyst::Context->new( request => $request, namespace => 'yada' ),
-              } );
+my $context = Catalyst::Context->new( request => $request, namespace => 'yada', application => Catalyst->new() );
 
 is(
-    Catalyst::uri_for( $context, '/bar/baz' )->as_string,
+    Catalyst::Context::uri_for( $context, '/bar/baz' )->as_string,
     'http://127.0.0.1/foo/bar/baz',
     'URI for absolute path'
 );
 
 is(
-    Catalyst::uri_for( $context, 'bar/baz' )->as_string,
+    Catalyst::Context::uri_for( $context, 'bar/baz' )->as_string,
     'http://127.0.0.1/foo/yada/bar/baz',
     'URI for relative path'
 );
 
 is(
-    Catalyst::uri_for( $context, '', 'arg1', 'arg2' )->as_string,
+    Catalyst::Context::uri_for( $context, '', 'arg1', 'arg2' )->as_string,
     'http://127.0.0.1/foo/yada/arg1/arg2',
     'URI for undef action with args'
 );
 
 
-is( Catalyst::uri_for( $context, '../quux' )->as_string,
+is( Catalyst::Context::uri_for( $context, '../quux' )->as_string,
     'http://127.0.0.1/foo/quux', 'URI for relative dot path' );
 
 is(
-    Catalyst::uri_for( $context, 'quux', { param1 => 'value1' } )->as_string,
+    Catalyst::Context::uri_for( $context, 'quux', { param1 => 'value1' } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param1=value1',
     'URI for undef action with query params'
 );
 
-is (Catalyst::uri_for( $context, '/bar/wibble?' )->as_string,
+is (Catalyst::Context::uri_for( $context, '/bar/wibble?' )->as_string,
    'http://127.0.0.1/foo/bar/wibble%3F', 'Question Mark gets encoded'
 );
    
-is( Catalyst::uri_for( $context, qw/bar wibble?/, 'with space' )->as_string,
+is( Catalyst::Context::uri_for( $context, qw/bar wibble?/, 'with space' )->as_string,
     'http://127.0.0.1/foo/yada/bar/wibble%3F/with%20space', 'Space gets encoded'
 );
 
 is(
-    Catalyst::uri_for( $context, '/bar', 'with+plus', { 'also' => 'with+plus' })->as_string,
+    Catalyst::Context::uri_for( $context, '/bar', 'with+plus', { 'also' => 'with+plus' })->as_string,
     'http://127.0.0.1/foo/bar/with+plus?also=with%2Bplus',
     'Plus is not encoded'
 );
 
 # test with utf-8
 is(
-    Catalyst::uri_for( $context, 'quux', { param1 => "\x{2620}" } )->as_string,
+    Catalyst::Context::uri_for( $context, 'quux', { param1 => "\x{2620}" } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param1=%E2%98%A0',
     'URI for undef action with query params in unicode'
 );
 is(
-    Catalyst::uri_for( $context, 'quux', { 'param:1' => "foo" } )->as_string,
+    Catalyst::Context::uri_for( $context, 'quux', { 'param:1' => "foo" } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param%3A1=foo',
     'URI for undef action with query params in unicode'
 );
 
 # test with object
 is(
-    Catalyst::uri_for( $context, 'quux', { param1 => $request->base } )->as_string,
+    Catalyst::Context::uri_for( $context, 'quux', { param1 => $request->base } )->as_string,
     'http://127.0.0.1/foo/yada/quux?param1=http%3A%2F%2F127.0.0.1%2Ffoo',
     'URI for undef action with query param as object'
 );
@@ -78,7 +76,7 @@ is(
 $request->base( URI->new('http://localhost:3000/') );
 $request->match( 'orderentry/contract' );
 is(
-    Catalyst::uri_for( $context, '/Orderentry/saveContract' )->as_string,
+    Catalyst::Context::uri_for( $context, '/Orderentry/saveContract' )->as_string,
     'http://localhost:3000/Orderentry/saveContract',
     'URI for absolute path'
 );
@@ -88,11 +86,11 @@ is(
 
     $context->namespace('');
 
-    is( Catalyst::uri_for( $context, '/bar/baz' )->as_string,
+    is( Catalyst::Context::uri_for( $context, '/bar/baz' )->as_string,
         'http://127.0.0.1/bar/baz', 'URI with no base or match' );
 
     # test "0" as the path
-    is( Catalyst::uri_for( $context, qw/0 foo/ )->as_string,
+    is( Catalyst::Context::uri_for( $context, qw/0 foo/ )->as_string,
         'http://127.0.0.1/0/foo', '0 as path is ok'
     );
 
@@ -103,12 +101,12 @@ is(
     my $warnings = 0;
     local $SIG{__WARN__} = sub { $warnings++ };
 
-    Catalyst::uri_for( $context, '/bar/baz', { foo => undef } )->as_string,
+    Catalyst::Context::uri_for( $context, '/bar/baz', { foo => undef } )->as_string,
     is( $warnings, 0, "no warnings emitted" );
 }
 
 # Test with parameters '/', 'foo', 'bar' - should not generate a //
-is( Catalyst::uri_for( $context, qw| / foo bar | )->as_string,
+is( Catalyst::Context::uri_for( $context, qw| / foo bar | )->as_string,
     'http://127.0.0.1/foo/bar', 'uri is /foo/bar, not //foo/bar'
 );
 
@@ -118,7 +116,7 @@ TODO: {
     # according to the RFC, but it is a very big feature change so I've removed it
     no warnings; # Yes, everything in qw is sane
     is(
-        Catalyst::uri_for( $context, qw|! * ' ( ) ; : @ & = $ / ? % # [ ] ,|, )->as_string,
+        Catalyst::Context::uri_for( $context, qw|! * ' ( ) ; : @ & = $ / ? % # [ ] ,|, )->as_string,
         'http://127.0.0.1/%21/%2A/%27/%2B/%29/%3B/%3A/%40/%26/%3D/%24/%2C/%2F/%3F/%25/%23/%5B/%5D',
         'rfc 3986 reserved characters'
     );
@@ -126,7 +124,7 @@ TODO: {
     # jshirley bug - why the hell does only one of these get encoded
     #                has been like this forever however.
     is(
-        Catalyst::uri_for( $context, qw|{1} {2}| )->as_string,
+        Catalyst::Context::uri_for( $context, qw|{1} {2}| )->as_string,
         'http://127.0.0.1/{1}/{2}',
         'not-escaping unreserved characters'
     );
@@ -138,7 +136,7 @@ TODO: {
                              bar  => ["foo baz", "bar"]};
     my $query_params_test = {test => "one two",
                              bar  => ["foo baz", "bar"]};
-    Catalyst::uri_for($context, '/bar/baz', $query_params_test);
+    Catalyst::Context::uri_for($context, '/bar/baz', $query_params_test);
     is_deeply($query_params_base, $query_params_test,
               "uri_for() doesn't mess up query parameter hash in the caller");
 }