diff options
| author | Kevin Stone | 2013-01-21 09:37:50 -0800 | 
|---|---|---|
| committer | Kevin Stone | 2013-01-21 09:37:50 -0800 | 
| commit | e7916ae0b1c4af35c55dc21e0d882f3f8ff3121e (patch) | |
| tree | fd92afb9bfdb6ffe03e8fe3886d4a3f175537e97 | |
| parent | 71bd2faa792569c9f4c83a06904b927616bfdbf1 (diff) | |
| download | django-rest-framework-e7916ae0b1c4af35c55dc21e0d882f3f8ff3121e.tar.bz2 | |
Tweaked some method names to be more clear and added a docstring to the test case class.
Signed-off-by: Kevin Stone <kevinastone@gmail.com>
| -rw-r--r-- | rest_framework/tests/urlpatterns.py | 19 | 
1 files changed, 11 insertions, 8 deletions
diff --git a/rest_framework/tests/urlpatterns.py b/rest_framework/tests/urlpatterns.py index e96e7cf3..43e8ef69 100644 --- a/rest_framework/tests/urlpatterns.py +++ b/rest_framework/tests/urlpatterns.py @@ -13,12 +13,15 @@ from rest_framework.urlpatterns import format_suffix_patterns  URLTestPath = namedtuple('URLTestPath', ['path', 'args', 'kwargs']) -def test_view(request, *args, **kwargs): +def dummy_view(request, *args, **kwargs):      pass  class FormatSuffixTests(TestCase): -    def _test_urlpatterns(self, urlpatterns, test_paths): +    """ +    Tests `format_suffix_patterns` against different URLPatterns to ensure the URLs still resolve properly, including any captured parameters. +    """ +    def _resolve_urlpatterns(self, urlpatterns, test_paths):          factory = RequestFactory()          try:              urlpatterns = format_suffix_patterns(urlpatterns) @@ -37,31 +40,31 @@ class FormatSuffixTests(TestCase):      def test_format_suffix(self):          urlpatterns = patterns(              '', -            url(r'^test$', test_view), +            url(r'^test$', dummy_view),          )          test_paths = [              URLTestPath('/test', (), {}),              URLTestPath('/test.api', (), {'format': 'api'}),              URLTestPath('/test.asdf', (), {'format': 'asdf'}),          ] -        self._test_urlpatterns(urlpatterns, test_paths) +        self._resolve_urlpatterns(urlpatterns, test_paths)      def test_default_args(self):          urlpatterns = patterns(              '', -            url(r'^test$', test_view, {'foo': 'bar'}), +            url(r'^test$', dummy_view, {'foo': 'bar'}),          )          test_paths = [              URLTestPath('/test', (), {'foo': 'bar', }),              URLTestPath('/test.api', (), {'foo': 'bar', 'format': 'api'}),              URLTestPath('/test.asdf', (), {'foo': 'bar', 'format': 'asdf'}),          ] -        self._test_urlpatterns(urlpatterns, test_paths) +        self._resolve_urlpatterns(urlpatterns, test_paths)      def test_included_urls(self):          nested_patterns = patterns(              '', -            url(r'^path$', test_view) +            url(r'^path$', dummy_view)          )          urlpatterns = patterns(              '', @@ -72,4 +75,4 @@ class FormatSuffixTests(TestCase):              URLTestPath('/test/path.api', (), {'foo': 'bar', 'format': 'api'}),              URLTestPath('/test/path.asdf', (), {'foo': 'bar', 'format': 'asdf'}),          ] -        self._test_urlpatterns(urlpatterns, test_paths) +        self._resolve_urlpatterns(urlpatterns, test_paths)  | 
