From 9af96b4098811d6edd994ef95a31caee7b5d1427 Mon Sep 17 00:00:00 2001 From: Bryan Veloso Date: Fri, 9 Sep 2011 16:33:13 -0700 Subject: [PATCH] Creating a dedicated tests directory. Moves tests.py out of the main module. Still a work in progress. --- tests/models.py | 15 +++++++++++++++ tests/settings.py | 23 ++++++++++++++++++++++ tests/specs.py | 27 ++++++++++++++++++++++++++ {imagekit => tests}/tests.py | 37 ------------------------------------ 4 files changed, 65 insertions(+), 37 deletions(-) create mode 100644 tests/models.py create mode 100644 tests/settings.py create mode 100644 tests/specs.py rename {imagekit => tests}/tests.py (68%) diff --git a/tests/models.py b/tests/models.py new file mode 100644 index 0000000..7f70642 --- /dev/null +++ b/tests/models.py @@ -0,0 +1,15 @@ +from django.db import models + +from imagekit import processors +from imagekit.models import ImageModel + + +class TestPhoto(ImageModel): + """ + Minimal ImageModel class for testing. + + """ + image = models.ImageField(upload_to='images') + + class IKOptions: + spec_module = 'specs' diff --git a/tests/settings.py b/tests/settings.py new file mode 100644 index 0000000..7ac9ca3 --- /dev/null +++ b/tests/settings.py @@ -0,0 +1,23 @@ +import os + +ADMINS = ( + ('test@example.com', 'TEST-R'), +) + +BASE_PATH = os.path.abspath(os.path.dirname(__file__)) + +MEDIA_ROOT = os.path.normpath(os.path.join(BASE_PATH, 'media')) + +DATABASE_ENGINE = 'sqlite3' +DATABASE_NAME = 'imagekit.db' +TEST_DATABASE_NAME = 'imagekit-test.db' + +INSTALLED_APPS = [ + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'imagekit', +] + +DEBUG = True +TEMPLATE_DEBUG = DEBUG +CACHE_BACKEND = 'locmem://' diff --git a/tests/specs.py b/tests/specs.py new file mode 100644 index 0000000..326f8b4 --- /dev/null +++ b/tests/specs.py @@ -0,0 +1,27 @@ +from imagekit.specs import ImageSpec + + +class ResizeToWidth(processors.Resize): + width = 100 + +class ResizeToHeight(processors.Resize): + height = 100 + +class ResizeToFit(processors.Resize): + width = 100 + height = 100 + +class ResizeCropped(ResizeToFit): + crop = ('center', 'center') + +class TestResizeToWidth(ImageSpec): + access_as = 'to_width' + processors = [ResizeToWidth] + +class TestResizeToHeight(ImageSpec): + access_as = 'to_height' + processors = [ResizeToHeight] + +class TestResizeCropped(ImageSpec): + access_as = 'cropped' + processors = [ResizeCropped] diff --git a/imagekit/tests.py b/tests/tests.py similarity index 68% rename from imagekit/tests.py rename to tests/tests.py index eb2ec6c..f56b4d0 100644 --- a/imagekit/tests.py +++ b/tests/tests.py @@ -3,48 +3,11 @@ import tempfile import unittest from django.conf import settings from django.core.files.base import ContentFile -from django.db import models from django.test import TestCase -from imagekit import processors -from imagekit.models import ImageModel -from imagekit.specs import ImageSpec from imagekit.lib import Image -class ResizeToWidth(processors.Resize): - width = 100 - -class ResizeToHeight(processors.Resize): - height = 100 - -class ResizeToFit(processors.Resize): - width = 100 - height = 100 - -class ResizeCropped(ResizeToFit): - crop = ('center', 'center') - -class TestResizeToWidth(ImageSpec): - access_as = 'to_width' - processors = [ResizeToWidth] - -class TestResizeToHeight(ImageSpec): - access_as = 'to_height' - processors = [ResizeToHeight] - -class TestResizeCropped(ImageSpec): - access_as = 'cropped' - processors = [ResizeCropped] - -class TestPhoto(ImageModel): - """ Minimal ImageModel class for testing """ - image = models.ImageField(upload_to='images') - - class IKOptions: - spec_module = 'imagekit.tests' - - class IKTest(TestCase): """ Base TestCase class """ def generate_image(self):