Commit efa27fc8 authored by Russell Keith-Magee's avatar Russell Keith-Magee
Browse files

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

[1.2.X] A few test optimizations; using native unittest where no Django-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
parent 5277425a

tests/regressiontests/utils/checksums.py

+2 −2
Original line number Diff line number Diff line 
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):

        """

tests/regressiontests/utils/datastructures.py

+3 −2
Original line number Diff line number Diff line 
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'

tests/regressiontests/utils/dateformat.py

+4 −3
Original line number Diff line number Diff line 
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)

tests/regressiontests/utils/datetime_safe.py

+2 −2
Original line number Diff line number Diff line 
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)

tests/regressiontests/utils/feedgenerator.py

+2 −2
Original line number Diff line number Diff line 
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.

    """