aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-06-26 22:43:17 +0100
committerTom Christie2013-06-26 22:43:17 +0100
commit91b9fcb0ba2541b2752e2ab0706becad14bdda20 (patch)
tree2e54617423401f5d0b4606346d769db9c970b647
parentb564008a0199f0bf7b6087fa094876ec57c4f764 (diff)
downloaddjango-rest-framework-91b9fcb0ba2541b2752e2ab0706becad14bdda20.tar.bz2
Minor test cleanup
-rw-r--r--rest_framework/tests/test_description.py24
-rw-r--r--rest_framework/tests/views.py25
2 files changed, 22 insertions, 27 deletions
diff --git a/rest_framework/tests/test_description.py b/rest_framework/tests/test_description.py
index bc86e106..ea4b2c3a 100644
--- a/rest_framework/tests/test_description.py
+++ b/rest_framework/tests/test_description.py
@@ -5,8 +5,6 @@ from django.test import TestCase
from rest_framework.views import APIView
from rest_framework.compat import apply_markdown, smart_text
from rest_framework.utils.formatting import get_view_name, get_view_description
-from rest_framework.tests.views import (
- ViewWithNonASCIICharactersInDocstring, UTF8_TEST_DOCSTRING)
# We check that docstrings get nicely un-indented.
DESCRIPTION = """an example docstring
@@ -51,6 +49,28 @@ MARKED_DOWN_gte_21 = """<h2 id="an-example-docstring">an example docstring</h2>
<h2 id="hash-style-header">hash style header</h2>"""
+# test strings snatched from http://www.columbia.edu/~fdc/utf8/,
+# http://winrus.com/utf8-jap.htm and memory
+UTF8_TEST_DOCSTRING = (
+ 'zażółć gęślą jaźń'
+ 'Sîne klâwen durh die wolken sint geslagen'
+ 'Τη γλώσσα μου έδωσαν ελληνική'
+ 'யாமறிந்த மொழிகளிலே தமிழ்மொழி'
+ 'На берегу пустынных волн'
+ 'てすと'
+ 'アイウエオカキクケコサシスセソタチツテ'
+)
+
+
+# Apparently there is an issue where docstrings of imported view classes
+# do not retain their encoding information even if a module has a proper
+# encoding declaration at the top of its source file. Therefore for tests
+# to catch unicode related errors, a mock view has to be declared in a separate
+# module.
+class ViewWithNonASCIICharactersInDocstring(APIView):
+ __doc__ = UTF8_TEST_DOCSTRING
+
+
class TestViewNamesAndDescriptions(TestCase):
def test_view_name_uses_class_name(self):
"""
diff --git a/rest_framework/tests/views.py b/rest_framework/tests/views.py
deleted file mode 100644
index fc00cc0b..00000000
--- a/rest_framework/tests/views.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from rest_framework.views import APIView
-
-
-# test strings snatched from http://www.columbia.edu/~fdc/utf8/,
-# http://winrus.com/utf8-jap.htm and memory
-UTF8_TEST_DOCSTRING = (
- 'zażółć gęślą jaźń'
- 'Sîne klâwen durh die wolken sint geslagen'
- 'Τη γλώσσα μου έδωσαν ελληνική'
- 'யாமறிந்த மொழிகளிலே தமிழ்மொழி'
- 'На берегу пустынных волн'
- 'てすと'
- 'アイウエオカキクケコサシスセソタチツテ'
-)
-
-
-# Apparently there is an issue where docstrings of imported view classes
-# do not retain their encoding information even if a module has a proper
-# encoding declaration at the top of its source file. Therefore for tests
-# to catch unicode related errors, a mock view has to be declared in a separate
-# module.
-class ViewWithNonASCIICharactersInDocstring(APIView):
- __doc__ = UTF8_TEST_DOCSTRING