Author: SmileyChris
Date: 2011-11-06 17:09:13 -0800 (Sun, 06 Nov 2011)
New Revision: 17075
Modified:
django/trunk/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
django/trunk/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
Log:
Fixes #17173 -- Added some extra regression tests for reversing namespaced urls
with special characters
The actual code was already fixed between 1.3.1 and trunk, but more thorough
tests are always a good thing. Thanks for the patch, Yann Kaiser.
Modified:
django/trunk/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
===================================================================
---
django/trunk/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
2011-11-06 16:59:26 UTC (rev 17074)
+++
django/trunk/tests/regressiontests/urlpatterns_reverse/included_namespace_urls.py
2011-11-07 01:09:13 UTC (rev 17075)
@@ -12,6 +12,8 @@
url(r'^normal/$', 'empty_view', name='inc-normal-view'),
url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view',
name='inc-normal-view'),
+ url(r'^\+\\\$\*/$', 'empty_view', name='inc-special-view'),
+
url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view',
name='inc-mixed-args'),
url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='inc-no-kwargs'),
Modified:
django/trunk/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
2011-11-06 16:59:26 UTC (rev 17074)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/namespace_urls.py
2011-11-07 01:09:13 UTC (rev 17075)
@@ -14,6 +14,7 @@
return patterns('',
url(r'^inner/$', 'empty_view', name='urlobject-view'),
url(r'^inner/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view',
name='urlobject-view'),
+ url(r'^inner/\+\\\$\*/$', 'empty_view',
name='urlobject-special-view'),
), self.app_name, self.namespace
urls = property(urls)
@@ -28,6 +29,8 @@
url(r'^normal/$', 'empty_view', name='normal-view'),
url(r'^normal/(?P<arg1>\d+)/(?P<arg2>\d+)/$', 'empty_view',
name='normal-view'),
+ url(r'^\+\\\$\*/$', 'empty_view', name='special-view'),
+
url(r'^mixed_args/(\d+)/(?P<arg2>\d+)/$', 'empty_view', name='mixed-args'),
url(r'^no_kwargs/(\d+)/(\d+)/$', 'empty_view', name='no-kwargs'),
@@ -50,4 +53,5 @@
(r'^ns-outer/(?P<outer>\d+)/',
include('regressiontests.urlpatterns_reverse.included_namespace_urls',
namespace='inc-outer')),
+ (r'^\+\\\$\*/',
include('regressiontests.urlpatterns_reverse.namespace_urls',
namespace='special')),
)
Modified: django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
===================================================================
--- django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2011-11-06 16:59:26 UTC (rev 17074)
+++ django/trunk/tests/regressiontests/urlpatterns_reverse/tests.py
2011-11-07 01:09:13 UTC (rev 17075)
@@ -294,30 +294,35 @@
self.assertEqual('/normal/', reverse('normal-view'))
self.assertEqual('/normal/37/42/', reverse('normal-view',
args=[37,42]))
self.assertEqual('/normal/42/37/', reverse('normal-view',
kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/+%5C$*/', reverse('special-view'))
def test_simple_included_name(self):
"Normal lookups work on names included from other patterns"
self.assertEqual('/included/normal/', reverse('inc-normal-view'))
self.assertEqual('/included/normal/37/42/', reverse('inc-normal-view',
args=[37,42]))
self.assertEqual('/included/normal/42/37/', reverse('inc-normal-view',
kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/included/+%5C$*/', reverse('inc-special-view'))
def test_namespace_object(self):
"Dynamic URL objects can be found using a namespace"
self.assertEqual('/test1/inner/', reverse('test-ns1:urlobject-view'))
self.assertEqual('/test1/inner/37/42/',
reverse('test-ns1:urlobject-view', args=[37,42]))
self.assertEqual('/test1/inner/42/37/',
reverse('test-ns1:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/test1/inner/+%5C$*/',
reverse('test-ns1:urlobject-special-view'))
def test_embedded_namespace_object(self):
"Namespaces can be installed anywhere in the URL pattern tree"
self.assertEqual('/included/test3/inner/',
reverse('test-ns3:urlobject-view'))
self.assertEqual('/included/test3/inner/37/42/',
reverse('test-ns3:urlobject-view', args=[37,42]))
self.assertEqual('/included/test3/inner/42/37/',
reverse('test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/included/test3/inner/+%5C$*/',
reverse('test-ns3:urlobject-special-view'))
def test_namespace_pattern(self):
"Namespaces can be applied to include()'d urlpatterns"
self.assertEqual('/ns-included1/normal/',
reverse('inc-ns1:inc-normal-view'))
self.assertEqual('/ns-included1/normal/37/42/',
reverse('inc-ns1:inc-normal-view', args=[37,42]))
self.assertEqual('/ns-included1/normal/42/37/',
reverse('inc-ns1:inc-normal-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/ns-included1/+%5C$*/',
reverse('inc-ns1:inc-special-view'))
def test_namespace_pattern_with_variable_prefix(self):
"When using a include with namespaces when there is a regex variable
in front of it"
@@ -325,41 +330,55 @@
self.assertEqual('/ns-outer/42/normal/',
reverse('inc-outer:inc-normal-view', args=[42]))
self.assertEqual('/ns-outer/42/normal/37/4/',
reverse('inc-outer:inc-normal-view', kwargs={'outer':42, 'arg1': 37, 'arg2':
4}))
self.assertEqual('/ns-outer/42/normal/37/4/',
reverse('inc-outer:inc-normal-view', args=[42, 37, 4]))
+ self.assertEqual('/ns-outer/42/+%5C$*/',
reverse('inc-outer:inc-special-view', kwargs={'outer':42}))
+ self.assertEqual('/ns-outer/42/+%5C$*/',
reverse('inc-outer:inc-special-view', args=[42]))
def test_multiple_namespace_pattern(self):
"Namespaces can be embedded"
self.assertEqual('/ns-included1/test3/inner/',
reverse('inc-ns1:test-ns3:urlobject-view'))
self.assertEqual('/ns-included1/test3/inner/37/42/',
reverse('inc-ns1:test-ns3:urlobject-view', args=[37,42]))
self.assertEqual('/ns-included1/test3/inner/42/37/',
reverse('inc-ns1:test-ns3:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/ns-included1/test3/inner/+%5C$*/',
reverse('inc-ns1:test-ns3:urlobject-special-view'))
def test_nested_namespace_pattern(self):
"Namespaces can be nested"
self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/',
reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view'))
self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/37/42/',
reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view', args=[37,42]))
self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/42/37/',
reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-view', kwargs={'arg1':42,
'arg2':37}))
+
self.assertEqual('/ns-included1/ns-included4/ns-included1/test3/inner/+%5C$*/',
reverse('inc-ns1:inc-ns4:inc-ns1:test-ns3:urlobject-special-view'))
def test_app_lookup_object(self):
"A default application namespace can be used for lookup"
self.assertEqual('/default/inner/', reverse('testapp:urlobject-view'))
self.assertEqual('/default/inner/37/42/',
reverse('testapp:urlobject-view', args=[37,42]))
self.assertEqual('/default/inner/42/37/',
reverse('testapp:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/default/inner/+%5C$*/',
reverse('testapp:urlobject-special-view'))
def test_app_lookup_object_with_default(self):
"A default application namespace is sensitive to the 'current' app can
be used for lookup"
self.assertEqual('/included/test3/inner/',
reverse('testapp:urlobject-view', current_app='test-ns3'))
self.assertEqual('/included/test3/inner/37/42/',
reverse('testapp:urlobject-view', args=[37,42], current_app='test-ns3'))
self.assertEqual('/included/test3/inner/42/37/',
reverse('testapp:urlobject-view', kwargs={'arg1':42, 'arg2':37},
current_app='test-ns3'))
+ self.assertEqual('/included/test3/inner/+%5C$*/',
reverse('testapp:urlobject-special-view', current_app='test-ns3'))
def test_app_lookup_object_without_default(self):
"An application namespace without a default is sensitive to the
'current' app can be used for lookup"
self.assertEqual('/other2/inner/', reverse('nodefault:urlobject-view'))
self.assertEqual('/other2/inner/37/42/',
reverse('nodefault:urlobject-view', args=[37,42]))
self.assertEqual('/other2/inner/42/37/',
reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/other2/inner/+%5C$*/',
reverse('nodefault:urlobject-special-view'))
self.assertEqual('/other1/inner/', reverse('nodefault:urlobject-view',
current_app='other-ns1'))
self.assertEqual('/other1/inner/37/42/',
reverse('nodefault:urlobject-view', args=[37,42], current_app='other-ns1'))
self.assertEqual('/other1/inner/42/37/',
reverse('nodefault:urlobject-view', kwargs={'arg1':42, 'arg2':37},
current_app='other-ns1'))
+ self.assertEqual('/other1/inner/+%5C$*/',
reverse('nodefault:urlobject-special-view', current_app='other-ns1'))
+ def test_special_chars_namespace(self):
+ self.assertEqual('/+%5C$*/included/normal/',
reverse('special:inc-normal-view'))
+ self.assertEqual('/+%5C$*/included/normal/37/42/',
reverse('special:inc-normal-view', args=[37,42]))
+ self.assertEqual('/+%5C$*/included/normal/42/37/',
reverse('special:inc-normal-view', kwargs={'arg1':42, 'arg2':37}))
+ self.assertEqual('/+%5C$*/included/+%5C$*/',
reverse('special:inc-special-view'))
+
class RequestURLconfTests(TestCase):
def setUp(self):
self.root_urlconf = settings.ROOT_URLCONF
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
