mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-09 11:29:13 +00:00
Code Issues 32 Releases Wiki Activity

Used skipIf decorator to skip image tests when PIL is not available

Browse Source
This commit is contained in:
Claude Paroz 2012-07-06 11:15:20 +02:00
parent 8fdc56d2a6
commit 86eb606b88
2 changed files with 379 additions and 369 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
tests/regressiontests/model_fields/imagefield.py
View File

@ -6,18 +6,23 @@ import shutil
from django.core.files import File from django.core.files import File
from django.core.files.images import ImageFile from django.core.files.images import ImageFile
from django.test import TestCase from django.test import TestCase
from django.utils.unittest import skipIf
from .models import (Image, Person, PersonWithHeight, PersonWithHeightAndWidth, from .models import Image
PersonDimensionsFirst, PersonTwoImages, TestImageFieldFile)
# If PIL available, do these tests.
if Image: if Image:
from .models import (Person, PersonWithHeight, PersonWithHeightAndWidth,
PersonDimensionsFirst, PersonTwoImages, TestImageFieldFile)
from .models import temp_storage_dir from .models import temp_storage_dir
else:
# PIL not available, create dummy classes (tests will be skipped anyway)
class Person():
pass
PersonWithHeight = PersonWithHeightAndWidth = PersonDimensionsFirst = Person
PersonTwoImages = Person
class ImageFieldTestMixin(object): class ImageFieldTestMixin(object):
""" """
Mixin class to provide common functionality to ImageField test classes. Mixin class to provide common functionality to ImageField test classes.
""" """
@ -83,7 +88,8 @@ if Image:
self.assertEqual(getattr(instance, height_field_name), height) self.assertEqual(getattr(instance, height_field_name), height)
class ImageFieldTests(ImageFieldTestMixin, TestCase): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldTests(ImageFieldTestMixin, TestCase):
""" """
Tests for ImageField that don't need to be run with each of the Tests for ImageField that don't need to be run with each of the
different test model classes. different test model classes.
@ -169,7 +175,8 @@ if Image:
self.assertEqual(p.mugshot, loaded_p.mugshot) self.assertEqual(p.mugshot, loaded_p.mugshot)
class ImageFieldTwoDimensionsTests(ImageFieldTestMixin, TestCase): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldTwoDimensionsTests(ImageFieldTestMixin, TestCase):
""" """
Tests behavior of an ImageField and its dimensions fields. Tests behavior of an ImageField and its dimensions fields.
""" """
@ -282,7 +289,8 @@ if Image:
self.assertEqual(p.mugshot.was_opened, True) self.assertEqual(p.mugshot.was_opened, True)
class ImageFieldNoDimensionsTests(ImageFieldTwoDimensionsTests): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldNoDimensionsTests(ImageFieldTwoDimensionsTests):
""" """
Tests behavior of an ImageField with no dimension fields. Tests behavior of an ImageField with no dimension fields.
""" """
@ -290,7 +298,8 @@ if Image:
PersonModel = Person PersonModel = Person
class ImageFieldOneDimensionTests(ImageFieldTwoDimensionsTests): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldOneDimensionTests(ImageFieldTwoDimensionsTests):
""" """
Tests behavior of an ImageField with one dimensions field. Tests behavior of an ImageField with one dimensions field.
""" """
@ -298,7 +307,8 @@ if Image:
PersonModel = PersonWithHeight PersonModel = PersonWithHeight
class ImageFieldDimensionsFirstTests(ImageFieldTwoDimensionsTests): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldDimensionsFirstTests(ImageFieldTwoDimensionsTests):
""" """
Tests behavior of an ImageField where the dimensions fields are Tests behavior of an ImageField where the dimensions fields are
defined before the ImageField. defined before the ImageField.
@ -307,7 +317,8 @@ if Image:
PersonModel = PersonDimensionsFirst PersonModel = PersonDimensionsFirst
class ImageFieldUsingFileTests(ImageFieldTwoDimensionsTests): @skipIf(Image is None, "PIL is required to test ImageField")
class ImageFieldUsingFileTests(ImageFieldTwoDimensionsTests):
""" """
Tests behavior of an ImageField when assigning it a File instance Tests behavior of an ImageField when assigning it a File instance
rather than an ImageFile instance. rather than an ImageFile instance.
@ -317,7 +328,8 @@ if Image:
File = File File = File
class TwoImageFieldTests(ImageFieldTestMixin, TestCase): @skipIf(Image is None, "PIL is required to test ImageField")
class TwoImageFieldTests(ImageFieldTestMixin, TestCase):
""" """
Tests a model with two ImageFields. Tests a model with two ImageFields.
""" """

4
tests/regressiontests/model_fields/tests.py
View File

@ -13,9 +13,7 @@ from django.utils import unittest
from .models import (Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post, from .models import (Foo, Bar, Whiz, BigD, BigS, Image, BigInt, Post,
NullBooleanModel, BooleanModel, Document, RenamedField) NullBooleanModel, BooleanModel, Document, RenamedField)
# If PIL available, do these tests. from .imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests,
if Image:
from .imagefield import (ImageFieldTests, ImageFieldTwoDimensionsTests,
TwoImageFieldTests, ImageFieldNoDimensionsTests, TwoImageFieldTests, ImageFieldNoDimensionsTests,
ImageFieldOneDimensionTests, ImageFieldDimensionsFirstTests, ImageFieldOneDimensionTests, ImageFieldDimensionsFirstTests,
ImageFieldUsingFileTests) ImageFieldUsingFileTests)