Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[1.2.X] A few test optimizations; using native unittest where no Djan…

…go-specific TestCase features are required.

Backport of r13935 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.2.X@13943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit efa27fc86cff473c5ca5c0d48bcd264c99d9fd47 1 parent 5277425
@freakboy3742 freakboy3742 authored
View
4 tests/regressiontests/utils/checksums.py
@@ -1,8 +1,8 @@
-from django.test import TestCase
+import unittest
from django.utils import checksums
-class TestUtilsChecksums(TestCase):
+class TestUtilsChecksums(unittest.TestCase):
def check_output(self, function, value, output=None):
"""
View
5 tests/regressiontests/utils/datastructures.py
@@ -1,7 +1,8 @@
-from django.test import TestCase
+import unittest
+
from django.utils.datastructures import SortedDict
-class DatastructuresTests(TestCase):
+class DatastructuresTests(unittest.TestCase):
def setUp(self):
self.d1 = SortedDict()
self.d1[7] = 'seven'
View
7 tests/regressiontests/utils/dateformat.py
@@ -1,10 +1,11 @@
-import os
-from unittest import TestCase
from datetime import datetime, date
+import os
+import unittest
+
from django.utils.dateformat import format
from django.utils.tzinfo import FixedOffset, LocalTimezone
-class DateFormatTests(TestCase):
+class DateFormatTests(unittest.TestCase):
def test_date(self):
d = date(2009, 5, 16)
self.assertEquals(date.fromtimestamp(int(format(d, 'U'))), d)
View
4 tests/regressiontests/utils/datetime_safe.py
@@ -1,9 +1,9 @@
-from django.test import TestCase
+import unittest
from datetime import date as original_date, datetime as original_datetime
from django.utils.datetime_safe import date, datetime
-class DatetimeTests(TestCase):
+class DatetimeTests(unittest.TestCase):
def setUp(self):
self.just_safe = (1900, 1, 1)
View
4 tests/regressiontests/utils/feedgenerator.py
@@ -1,9 +1,9 @@
import datetime
-from unittest import TestCase
+import unittest
from django.utils import feedgenerator, tzinfo
-class FeedgeneratorTest(TestCase):
+class FeedgeneratorTest(unittest.TestCase):
"""
Tests for the low-level syndication feed framework.
"""
View
4 tests/regressiontests/utils/functional.py
@@ -1,9 +1,9 @@
-from unittest import TestCase
+import unittest
from django.utils.functional import lazy
-class FunctionalTestCase(TestCase):
+class FunctionalTestCase(unittest.TestCase):
def test_lazy(self):
t = lazy(lambda: tuple(range(3)), list, tuple)
for a, b in zip(t(), range(3)):
View
4 tests/regressiontests/utils/html.py
@@ -1,8 +1,8 @@
-from django.test import TestCase
+import unittest
from django.utils import html
-class TestUtilsHtml(TestCase):
+class TestUtilsHtml(unittest.TestCase):
def check_output(self, function, value, output=None):
"""
View
6 tests/regressiontests/utils/module_loading.py
@@ -1,12 +1,12 @@
import os
import sys
-from unittest import TestCase
+import unittest
from zipimport import zipimporter
from django.utils.importlib import import_module
from django.utils.module_loading import module_has_submodule
-class DefaultLoader(TestCase):
+class DefaultLoader(unittest.TestCase):
def test_loader(self):
"Normal module existence can be tested"
test_module = import_module('regressiontests.utils.test_module')
@@ -24,7 +24,7 @@ def test_loader(self):
self.assertFalse(module_has_submodule(test_module, 'no_such_module'))
self.assertRaises(ImportError, import_module, 'regressiontests.utils.test_module.no_such_module')
-class EggLoader(TestCase):
+class EggLoader(unittest.TestCase):
def setUp(self):
self.old_path = sys.path
self.egg_dir = '%s/eggs' % os.path.dirname(__file__)
View
6 tests/regressiontests/utils/simplelazyobject.py
@@ -1,5 +1,6 @@
-from django.test import TestCase
+import unittest
+import django.utils.copycompat as copy
from django.utils.functional import SimpleLazyObject
class _ComplexObject(object):
@@ -23,7 +24,7 @@ def __repr__(self):
complex_object = lambda: _ComplexObject("joe")
-class TestUtilsSimpleLazyObject(TestCase):
+class TestUtilsSimpleLazyObject(unittest.TestCase):
"""
Tests for SimpleLazyObject
"""
@@ -59,7 +60,6 @@ def test_class(self):
self.assertEqual(_ComplexObject, SimpleLazyObject(complex_object).__class__)
def test_deepcopy(self):
- import django.utils.copycompat as copy
# Check that we *can* do deep copy, and that it returns the right
# objects.
View
4 tests/regressiontests/utils/termcolors.py
@@ -1,8 +1,8 @@
-from unittest import TestCase
+import unittest
from django.utils.termcolors import parse_color_setting, PALETTES, DEFAULT_PALETTE, LIGHT_PALETTE, DARK_PALETTE, NOCOLOR_PALETTE
-class TermColorTests(TestCase):
+class TermColorTests(unittest.TestCase):
def test_empty_string(self):
self.assertEquals(parse_color_setting(''), PALETTES[DEFAULT_PALETTE])
View
4 tests/regressiontests/utils/text.py
@@ -1,8 +1,8 @@
-from django.test import TestCase
+import unittest
from django.utils import text
-class TestUtilsText(TestCase):
+class TestUtilsText(unittest.TestCase):
def test_truncate_words(self):
self.assertEqual(u'The quick brown fox jumped over the lazy dog.',
text.truncate_words(u'The quick brown fox jumped over the lazy dog.', 10))
View
5 tests/regressiontests/utils/timesince.py
@@ -1,11 +1,10 @@
-from django.test import TestCase
-
import datetime
+import unittest
from django.utils.timesince import timesince, timeuntil
from django.utils.tzinfo import LocalTimezone, FixedOffset
-class TimesinceTests(TestCase):
+class TimesinceTests(unittest.TestCase):
def setUp(self):
self.t = datetime.datetime(2007, 8, 14, 13, 46, 0)
View
4 tests/regressiontests/utils/tzinfo.py
@@ -1,8 +1,8 @@
-from django.test import TestCase
+import unittest
from django.utils.tzinfo import FixedOffset
-class TzinfoTests(TestCase):
+class TzinfoTests(unittest.TestCase):
def test_fixedoffset(self):
self.assertEquals(repr(FixedOffset(0)), '+0000')
Please sign in to comment.
Something went wrong with that request. Please try again.