From addf2854e12b0e991c912621d7e9b9fc970252f1 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Thu, 28 Mar 2013 13:52:44 +0100 Subject: [PATCH 01/10] Cleanup pexp commands, remove direct settings import --- pexp/management/commands/p2cmd.py | 4 ---- pexp/management/commands/pcmd.py | 4 ---- pexp/management/commands/polybench.py | 3 --- pexp/management/commands/polymorphic_create_test_data.py | 4 ---- 4 files changed, 15 deletions(-) diff --git a/pexp/management/commands/p2cmd.py b/pexp/management/commands/p2cmd.py index 62bf318..1107370 100644 --- a/pexp/management/commands/p2cmd.py +++ b/pexp/management/commands/p2cmd.py @@ -8,7 +8,6 @@ import uuid from django.core.management.base import NoArgsCommand from django.db.models import connection from pprint import pprint -import settings import time,sys from pexp.models import * @@ -44,9 +43,6 @@ class Command(NoArgsCommand): help = "" def handle_noargs(self, **options): - print 'polycmd - sqlite test db is stored in:',settings.SQLITE_DB_PATH - print - if False: ModelA.objects.all().delete() a=ModelA.objects.create(field1='A1') diff --git a/pexp/management/commands/pcmd.py b/pexp/management/commands/pcmd.py index 2bb7245..92de13b 100644 --- a/pexp/management/commands/pcmd.py +++ b/pexp/management/commands/pcmd.py @@ -6,7 +6,6 @@ This module is a scratchpad for general development, testing & debugging. from django.core.management.base import NoArgsCommand from django.db.models import connection from pprint import pprint -import settings from pexp.models import * @@ -20,9 +19,6 @@ class Command(NoArgsCommand): help = "" def handle_noargs(self, **options): - print 'polycmd - sqlite test db is stored in:',settings.SQLITE_DB_PATH - print - Project.objects.all().delete() a=Project.objects.create(topic="John's gathering") b=ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner") diff --git a/pexp/management/commands/polybench.py b/pexp/management/commands/polybench.py index 2a279ae..44d19aa 100644 --- a/pexp/management/commands/polybench.py +++ b/pexp/management/commands/polybench.py @@ -6,7 +6,6 @@ This module is a scratchpad for general development, testing & debugging from django.core.management.base import NoArgsCommand from django.db.models import connection from pprint import pprint -import settings import sys from pexp.models import * @@ -90,8 +89,6 @@ class Command(NoArgsCommand): help = "" def handle_noargs(self, **options): - print 'polybench - sqlite test db is stored in:',settings.SQLITE_DB_PATH - func_list = [ ( bench_delete, 1 ), ( bench_create, 1 ), diff --git a/pexp/management/commands/polymorphic_create_test_data.py b/pexp/management/commands/polymorphic_create_test_data.py index e45811c..f7d81e5 100644 --- a/pexp/management/commands/polymorphic_create_test_data.py +++ b/pexp/management/commands/polymorphic_create_test_data.py @@ -6,7 +6,6 @@ This module is a scratchpad for general development, testing & debugging from django.core.management.base import NoArgsCommand from django.db.models import connection from pprint import pprint -import settings from pexp.models import * @@ -20,9 +19,6 @@ class Command(NoArgsCommand): help = "" def handle_noargs(self, **options): - print 'polycmd - sqlite test db is stored in:',settings.SQLITE_DB_PATH - print - Project.objects.all().delete() o=Project.objects.create(topic="John's gathering") o=ArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner") From 06ac5a479522c52e7ce038a0cb0dea3593909c88 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Thu, 28 Mar 2013 13:59:35 +0100 Subject: [PATCH 02/10] Convert Django project files in the root to example project. Move pexp project to 'example' folder too. --- dbreset | 5 - __init__.py => example/example/__init__.py | 0 example/example/settings.py | 100 ++++++++++++++++++ example/example/urls.py | 11 ++ example/example/wsgi.py | 28 +++++ example/manage.py | 14 +++ {pexp => example/pexp}/__init__.py | 0 {pexp => example/pexp}/admin.py | 0 .../pexp}/dumpdata_test_correct_output.txt | 0 {pexp => example/pexp}/management/__init__.py | 0 .../pexp}/management/commands/__init__.py | 0 .../pexp}/management/commands/p2cmd.py | 0 .../pexp}/management/commands/pcmd.py | 0 .../pexp}/management/commands/polybench.py | 0 .../commands/polymorphic_create_test_data.py | 0 {pexp => example/pexp}/models.py | 0 manage.py | 29 ----- pexp/tests.py | 23 ---- pexp/views.py | 1 - settings.py | 87 --------------- urls.py | 10 -- 21 files changed, 153 insertions(+), 155 deletions(-) delete mode 100755 dbreset rename __init__.py => example/example/__init__.py (100%) create mode 100644 example/example/settings.py create mode 100644 example/example/urls.py create mode 100644 example/example/wsgi.py create mode 100755 example/manage.py rename {pexp => example/pexp}/__init__.py (100%) rename {pexp => example/pexp}/admin.py (100%) rename {pexp => example/pexp}/dumpdata_test_correct_output.txt (100%) rename {pexp => example/pexp}/management/__init__.py (100%) rename {pexp => example/pexp}/management/commands/__init__.py (100%) rename {pexp => example/pexp}/management/commands/p2cmd.py (100%) rename {pexp => example/pexp}/management/commands/pcmd.py (100%) rename {pexp => example/pexp}/management/commands/polybench.py (100%) rename {pexp => example/pexp}/management/commands/polymorphic_create_test_data.py (100%) rename {pexp => example/pexp}/models.py (100%) delete mode 100755 manage.py delete mode 100644 pexp/tests.py delete mode 100644 pexp/views.py delete mode 100644 settings.py delete mode 100644 urls.py diff --git a/dbreset b/dbreset deleted file mode 100755 index d7c3e26..0000000 --- a/dbreset +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -rm /var/tmp/django-polymorphic-test-db.sqlite3 -./manage.py syncdb - diff --git a/__init__.py b/example/example/__init__.py similarity index 100% rename from __init__.py rename to example/example/__init__.py diff --git a/example/example/settings.py b/example/example/settings.py new file mode 100644 index 0000000..05a5c1f --- /dev/null +++ b/example/example/settings.py @@ -0,0 +1,100 @@ +import os + +DEBUG = True +TEMPLATE_DEBUG = DEBUG + +ADMINS = ( + # ('Your Name', 'your_email@example.com'), +) + +MANAGERS = ADMINS +PROJECT_ROOT = os.path.dirname(os.path.dirname(__file__)) + +DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': os.path.join(PROJECT_ROOT, 'example.db'), + } +} + +SITE_ID = 1 + +# Make this unique, and don't share it with anybody. +SECRET_KEY = '5$f%)&a4tc*bg(79+ku!7o$kri-duw99@hq_)va^_kaw9*l)!7' + + +# Language +# TIME_ZONE = 'America/Chicago' +LANGUAGE_CODE = 'en-us' +USE_I18N = True +USE_L10N = True +USE_TZ = True + +# Paths +MEDIA_ROOT = '' +MEDIA_URL = '/media/' +STATIC_ROOT = '' +STATIC_URL = '/static/' + +# Apps +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', +) + +TEMPLATE_LOADERS = ( + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', +) + +MIDDLEWARE_CLASSES = ( + 'django.middleware.common.CommonMiddleware', + 'django.contrib.sessions.middleware.SessionMiddleware', + 'django.middleware.csrf.CsrfViewMiddleware', + 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.messages.middleware.MessageMiddleware', +) + +ROOT_URLCONF = 'example.urls' + +WSGI_APPLICATION = 'example.wsgi.application' + +TEMPLATE_DIRS = () + +INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.admin', + 'django.contrib.contenttypes', + 'django.contrib.sessions', + #'django.contrib.sites', + 'django.contrib.messages', + 'django.contrib.staticfiles', + + 'polymorphic', # needed if you want to use the polymorphic admin + 'pexp', # this Django app is for testing and experimentation; not needed otherwise +) + +# Logging configuration +LOGGING = { + 'version': 1, + 'disable_existing_loggers': False, + 'filters': { + 'require_debug_false': { + '()': 'django.utils.log.RequireDebugFalse' + } + }, + 'handlers': { + 'mail_admins': { + 'level': 'ERROR', + 'filters': ['require_debug_false'], + 'class': 'django.utils.log.AdminEmailHandler' + } + }, + 'loggers': { + 'django.request': { + 'handlers': ['mail_admins'], + 'level': 'ERROR', + 'propagate': True, + }, + } +} diff --git a/example/example/urls.py b/example/example/urls.py new file mode 100644 index 0000000..d070426 --- /dev/null +++ b/example/example/urls.py @@ -0,0 +1,11 @@ +from django.conf.urls import patterns, include, url +from django.contrib import admin +from django.core.urlresolvers import reverse_lazy +from django.views.generic import RedirectView + +admin.autodiscover() + +urlpatterns = patterns('', + url(r'^admin/', include(admin.site.urls)), + url(r'^$', RedirectView.as_view(url=reverse_lazy('admin:index'), permanent=False)), +) diff --git a/example/example/wsgi.py b/example/example/wsgi.py new file mode 100644 index 0000000..9b42e63 --- /dev/null +++ b/example/example/wsgi.py @@ -0,0 +1,28 @@ +""" +WSGI config for example project. + +This module contains the WSGI application used by Django's development server +and any production WSGI deployments. It should expose a module-level variable +named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover +this application via the ``WSGI_APPLICATION`` setting. + +Usually you will have the standard Django WSGI application here, but it also +might make sense to replace the whole Django WSGI application with a custom one +that later delegates to the Django one. For example, you could introduce WSGI +middleware here, or combine a Django application with an application of another +framework. + +""" +import os + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") + +# This application object is used by any WSGI server configured to use this +# file. This includes Django's development server, if the WSGI_APPLICATION +# setting points here. +from django.core.wsgi import get_wsgi_application +application = get_wsgi_application() + +# Apply WSGI middleware here. +# from helloworld.wsgi import HelloWorldApplication +# application = HelloWorldApplication(application) diff --git a/example/manage.py b/example/manage.py new file mode 100755 index 0000000..f920f18 --- /dev/null +++ b/example/manage.py @@ -0,0 +1,14 @@ +#!/usr/bin/env python +import os +import sys + +if __name__ == "__main__": + os.environ.setdefault("DJANGO_SETTINGS_MODULE", "example.settings") + + # Import polymorphic from this folder. + SRC_ROOT = os.path.dirname(os.path.dirname(os.path.realpath(__file__))) + sys.path.insert(0, SRC_ROOT) + + from django.core.management import execute_from_command_line + + execute_from_command_line(sys.argv) diff --git a/pexp/__init__.py b/example/pexp/__init__.py similarity index 100% rename from pexp/__init__.py rename to example/pexp/__init__.py diff --git a/pexp/admin.py b/example/pexp/admin.py similarity index 100% rename from pexp/admin.py rename to example/pexp/admin.py diff --git a/pexp/dumpdata_test_correct_output.txt b/example/pexp/dumpdata_test_correct_output.txt similarity index 100% rename from pexp/dumpdata_test_correct_output.txt rename to example/pexp/dumpdata_test_correct_output.txt diff --git a/pexp/management/__init__.py b/example/pexp/management/__init__.py similarity index 100% rename from pexp/management/__init__.py rename to example/pexp/management/__init__.py diff --git a/pexp/management/commands/__init__.py b/example/pexp/management/commands/__init__.py similarity index 100% rename from pexp/management/commands/__init__.py rename to example/pexp/management/commands/__init__.py diff --git a/pexp/management/commands/p2cmd.py b/example/pexp/management/commands/p2cmd.py similarity index 100% rename from pexp/management/commands/p2cmd.py rename to example/pexp/management/commands/p2cmd.py diff --git a/pexp/management/commands/pcmd.py b/example/pexp/management/commands/pcmd.py similarity index 100% rename from pexp/management/commands/pcmd.py rename to example/pexp/management/commands/pcmd.py diff --git a/pexp/management/commands/polybench.py b/example/pexp/management/commands/polybench.py similarity index 100% rename from pexp/management/commands/polybench.py rename to example/pexp/management/commands/polybench.py diff --git a/pexp/management/commands/polymorphic_create_test_data.py b/example/pexp/management/commands/polymorphic_create_test_data.py similarity index 100% rename from pexp/management/commands/polymorphic_create_test_data.py rename to example/pexp/management/commands/polymorphic_create_test_data.py diff --git a/pexp/models.py b/example/pexp/models.py similarity index 100% rename from pexp/models.py rename to example/pexp/models.py diff --git a/manage.py b/manage.py deleted file mode 100755 index 7a60030..0000000 --- a/manage.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Prepend project subdirectory 'libraries-local' to sys.path. -# This allows us to use/test any version of Django -# (e.g. Django 1.2 subversion) or any other packages/libraries. -import sys, os -project_path = os.path.dirname(os.path.abspath(__file__)) -libs_local_path = os.path.join(project_path, 'libraries-local') -if libs_local_path not in sys.path: sys.path.insert(1, libs_local_path) - -sys.stderr.write( 'using Python version: %s\n' % sys.version[:5]) - -import django -sys.stderr.write( 'using Django version: %s, from %s\n' % ( - django.get_version(), - os.path.dirname(os.path.abspath(django.__file__))) ) - -# vanilla Django manage.py from here on: - -from django.core.management import execute_manager -try: - import settings # Assumed to be in the same directory. -except ImportError: - import sys - sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__) - sys.exit(1) - -if __name__ == "__main__": - execute_manager(settings) diff --git a/pexp/tests.py b/pexp/tests.py deleted file mode 100644 index 2247054..0000000 --- a/pexp/tests.py +++ /dev/null @@ -1,23 +0,0 @@ -""" -This file demonstrates two different styles of tests (one doctest and one -unittest). These will both pass when you run "manage.py test". - -Replace these with more appropriate tests for your application. -""" - -from django.test import TestCase - -class SimpleTest(TestCase): - def test_basic_addition(self): - """ - Tests that 1 + 1 always equals 2. - """ - self.failUnlessEqual(1 + 1, 2) - -__test__ = {"doctest": """ -Another way to test that 1 + 1 is equal to 2. - ->>> 1 + 1 == 2 -True -"""} - diff --git a/pexp/views.py b/pexp/views.py deleted file mode 100644 index 60f00ef..0000000 --- a/pexp/views.py +++ /dev/null @@ -1 +0,0 @@ -# Create your views here. diff --git a/settings.py b/settings.py deleted file mode 100644 index f95cfe7..0000000 --- a/settings.py +++ /dev/null @@ -1,87 +0,0 @@ -# Django settings for polymorphic_demo project. - -DEBUG = True -TEMPLATE_DEBUG = DEBUG - -ADMINS = ( - # ('Your Name', 'your_email@domain.com'), -) - -MANAGERS = ADMINS - -DATABASES = { - 'default': { - 'ENGINE': 'django.db.backends.sqlite3', - 'NAME': ':memory:' - } -} - -# Local time zone for this installation. Choices can be found here: -# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name -# although not all choices may be available on all operating systems. -# If running in a Windows environment this must be set to the same as your -# system time zone. -TIME_ZONE = 'America/Chicago' - -# Language code for this installation. All choices can be found here: -# http://www.i18nguy.com/unicode/language-identifiers.html -LANGUAGE_CODE = 'en-us' - -SITE_ID = 1 - -# If you set this to False, Django will make some optimizations so as not -# to load the internationalization machinery. -USE_I18N = True - -# Absolute path to the directory that holds media. -# Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' - -# URL that handles the media served from MEDIA_ROOT. Make sure to use a -# trailing slash if there is a path component (optional in other cases). -# Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '' - -# URL prefix for admin media -- CSS, JavaScript and images. Make sure to use a -# trailing slash. -# Examples: "http://foo.com/media/", "/media/". -ADMIN_MEDIA_PREFIX = '/media/' - -# Make this unique, and don't share it with anybody. -SECRET_KEY = 'nk=c&k+c&#+)8557)%&0auysdd3g^sfq6@rw8_x1k8)-p@y)!(' - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ( - 'django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', -) - -MIDDLEWARE_CLASSES = ( - 'django.middleware.common.CommonMiddleware', - 'django.contrib.sessions.middleware.SessionMiddleware', - 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.messages.middleware.MessageMiddleware', -) - -ROOT_URLCONF = 'urls' -STATIC_URL = '/static/' -ADMIN_MEDIA_PREFIX = '/static/admin/' # 1.3 compatibility - -TEMPLATE_DIRS = ( - # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates". - # Always use forward slashes, even on Windows. - # Don't forget to use absolute paths, not relative paths. -) - -INSTALLED_APPS = ( - 'django.contrib.auth', - 'django.contrib.admin', - 'django.contrib.contenttypes', - 'django.contrib.messages', - 'django.contrib.sessions', - 'django.contrib.staticfiles', - - #'django.contrib.sites', - 'polymorphic', # needed if you want to use the polymorphic admin - 'pexp', # this Django app is for testing and experimentation; not needed otherwise -) diff --git a/urls.py b/urls.py deleted file mode 100644 index d54ec31..0000000 --- a/urls.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.conf import settings -from django.conf.urls.defaults import patterns, include, url -from django.conf.urls.static import static -from django.contrib import admin - -admin.autodiscover() - -urlpatterns = patterns('', - url(r'^admin/', include(admin.site.urls)), -) From e7a234072372bfad1298defd95c80156b84bc940 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Thu, 28 Mar 2013 14:10:03 +0100 Subject: [PATCH 03/10] Remove polymorphic_dumpdata command and assorted scripts. The polymorphic_dumpdata command carried a deprecation note for a long time now. The scripts for testing python versions are replaced by tox already. --- diffmanagement | 8 -- polymorphic/management/__init__.py | 0 polymorphic/management/commands/__init__.py | 0 .../commands/polymorphic_dumpdata.py | 9 --- test_all_versions | 73 ------------------- test_dumpdata | 27 ------- 6 files changed, 117 deletions(-) delete mode 100755 diffmanagement delete mode 100644 polymorphic/management/__init__.py delete mode 100644 polymorphic/management/commands/__init__.py delete mode 100644 polymorphic/management/commands/polymorphic_dumpdata.py delete mode 100755 test_all_versions delete mode 100755 test_dumpdata diff --git a/diffmanagement b/diffmanagement deleted file mode 100755 index d27424d..0000000 --- a/diffmanagement +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -colordiff -u -w libraries-local/django-versions/django1.1/core/management/commands/dumpdata.py polymorphic/management/commands/polymorphic_dumpdata_11.py - -colordiff -u -w libraries-local/django-versions/django1.2/core/management/commands/dumpdata.py polymorphic/management/commands/polymorphic_dumpdata_12.py - -colordiff -u -w libraries-local/django-versions/django1.3/core/management/commands/dumpdata.py polymorphic/management/commands/polymorphic_dumpdata_13.py - diff --git a/polymorphic/management/__init__.py b/polymorphic/management/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/polymorphic/management/commands/__init__.py b/polymorphic/management/commands/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/polymorphic/management/commands/polymorphic_dumpdata.py b/polymorphic/management/commands/polymorphic_dumpdata.py deleted file mode 100644 index 09cf477..0000000 --- a/polymorphic/management/commands/polymorphic_dumpdata.py +++ /dev/null @@ -1,9 +0,0 @@ -""" -polymorphic_dumpdata has been disabled since it's no longer needed -(this is now handled by polymorphic.base.PolymorphicModelBase). -""" - -assert False, """ -ERROR: The management command polymorphic_dumpdata is no longer supported or needed. - Please use the standard Django dumpdata management command instead! -""" diff --git a/test_all_versions b/test_all_versions deleted file mode 100755 index 41d2ba9..0000000 --- a/test_all_versions +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# this test script runs "./manage.py test" for -# all supported python versions (2.4, 2.5, 2.6) -# and all supported Django versions (1.1, 1.2, 1.3) - -# it needs symbolic links named "django1.1" and "django1.2" etc. in: -# libraries-local/django-versions -# which point to the respective django versions - -cd libraries-local -rm -f django-orig -if test -e django ; then mv django django-orig ; fi -cd .. - -function restore_django { - echo "### restoring original libraries-local/django" - cd libraries-local - if test -e django-orig ; then mv django-orig django ; fi - cd . -} - -function test_python_version { - echo ; echo ; echo - echo "#########################################################################" - echo "### Testing Python $1, Django $2" - echo "#########################################################################" - echo - - if which python$1 ; then - if ! python$1 manage.py test polymorphic; then - echo ERROR - restore_django - exit 10 - fi - if ! ./test_dumpdata $1 ; then - echo ERROR - restore_django - exit 10 - fi - else - echo - echo "### python $1 is not installed!" - echo - fi -} - -function test_all_python_versions { - test_python_version 2.4 $1 - test_python_version 2.5 $1 - test_python_version 2.6 $1 -} - -function test_django_version { - if ! test -e libraries-local/django-versions/django$1 ; then - echo - echo "### django $1 is not installed!" - echo - return - fi - cd libraries-local - rm -f django - ln -s django-versions/django$1 django - cd .. - test_all_python_versions $1 -} - -test_django_version 1.1 -test_django_version 1.2 -test_django_version 1.3 - -restore_django - diff --git a/test_dumpdata b/test_dumpdata deleted file mode 100755 index 28b31a3..0000000 --- a/test_dumpdata +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -rm -f /var/tmp/django-polymorphic-test-db.sqlite3 -rm -f /ram/django-polymorphic-test-db.sqlite3 - -TMPFILE=/tmp/django-polymorphic-test.dump - -PYCMD="python$1" - -echo -echo "#####################################################################" -echo "### Testing dumpdata" -echo - -$PYCMD ./manage.py syncdb -$PYCMD ./manage.py polymorphic_create_test_data - -$PYCMD ./manage.py dumpdata --indent=4 pexp >$TMPFILE - -if ! diff -w $TMPFILE pexp/dumpdata_test_correct_output.txt ; then - echo "#####################################################################" - echo "ERROR: test_dumpdata failed!" - exit 10 -fi -echo "#####################################################################" -echo 'SUCCESS!' - From 1df5b5ff037df356a903a5b448e06e51ff1af418 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 09:50:58 +0200 Subject: [PATCH 04/10] Add runtests script Allow `python setup.py test` too. Fix tox invocation now that `manage.py` has moved. --- .gitignore | 1 + runtests.py | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++ setup.py | 1 + tox.ini | 2 +- 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100755 runtests.py diff --git a/.gitignore b/.gitignore index 959f397..df997af 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ lib/ MANIFEST dist/ *.egg-info +.tox/ diff --git a/runtests.py b/runtests.py new file mode 100755 index 0000000..bd4a86b --- /dev/null +++ b/runtests.py @@ -0,0 +1,60 @@ +#!/usr/bin/env python +from django.conf import settings, global_settings as default_settings +from django.core.management import call_command +from os.path import dirname, realpath +import django +import sys +import os + + +# Give feedback on used versions +sys.stderr.write('Using Python version {0} from {1}\n'.format(sys.version[:5], sys.executable)) +sys.stderr.write('Using Django version {0} from {1}\n'.format( + django.get_version(), + os.path.dirname(os.path.abspath(django.__file__))) +) + + +# Detect location and available modules +module_root = dirname(realpath(__file__)) + +# Inline settings file +settings.configure( + DEBUG = False, # will be False anyway by DjangoTestRunner. + TEMPLATE_DEBUG = False, + DATABASES = { + 'default': { + 'ENGINE': 'django.db.backends.sqlite3', + 'NAME': ':memory:' + } + }, + TEMPLATE_LOADERS = ( + 'django.template.loaders.app_directories.Loader', + ), + TEMPLATE_CONTEXT_PROCESSORS = default_settings.TEMPLATE_CONTEXT_PROCESSORS + ( + 'django.core.context_processors.request', + ), + INSTALLED_APPS = ( + 'django.contrib.auth', + 'django.contrib.contenttypes', + 'django.contrib.messages', + 'django.contrib.sites', + 'django.contrib.admin', + 'polymorphic', + ), + SITE_ID = 3, +) + +call_command('syncdb', verbosity=1, interactive=False) + + +# ---- app start +verbosity = 2 if '-v' in sys.argv else 1 + +from django.test.utils import get_runner +TestRunner = get_runner(settings) # DjangoTestSuiteRunner +runner = TestRunner(verbosity=verbosity, interactive=True, failfast=False) +failures = runner.run_tests(['polymorphic']) + +if failures: + sys.exit(bool(failures)) diff --git a/setup.py b/setup.py index 4a379a6..5442bff 100644 --- a/setup.py +++ b/setup.py @@ -20,6 +20,7 @@ setup( }, install_requires=['setuptools'], + test_suite='runtests', classifiers=[ 'Framework :: Django', diff --git a/tox.ini b/tox.ini index 681be81..a0faa6f 100644 --- a/tox.ini +++ b/tox.ini @@ -7,7 +7,7 @@ envlist= [testenv] commands= - python manage.py test + python runtests.py # Build configurations From 32426aa41a061fd80e18ff43d812589280af2a43 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Tue, 5 Mar 2013 18:16:50 +0100 Subject: [PATCH 05/10] Use self.assertEqual() in tests instead of assert statement. --- polymorphic/tests.py | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 3db803f..0c4c93f 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -8,6 +8,7 @@ import sys from pprint import pprint from django import VERSION as django_VERSION +from django.conf import settings from django.test import TestCase from django.db.models.query import QuerySet from django.db.models import Q,Count @@ -226,16 +227,16 @@ class testclass(TestCase): qs = BlogBase.objects.annotate(entrycount=Count('BlogA___blogentry')) - assert len(qs)==4 + self.assertEqual(len(qs), 4) for o in qs: if o.name=='B1': - assert o.entrycount == 2 + self.assertEqual(o.entrycount, 2) else: - assert o.entrycount == 0 + self.assertEqual(o.entrycount, 0) x = BlogBase.objects.aggregate(entrycount=Count('BlogA___blogentry')) - assert x['entrycount'] == 2 + self.assertEqual(x['entrycount'], 2) # create some more blogs for next test b2 = BlogA.objects.create(name='B2', info='i2') @@ -255,7 +256,7 @@ class testclass(TestCase): , ]''' x = '\n' + repr(BlogBase.objects.order_by('-name')) - assert x == expected + self.assertEqual(x, expected) ### test ordering for field in one subclass only @@ -282,7 +283,7 @@ class testclass(TestCase): ]''' x = '\n' + repr(BlogBase.objects.order_by('-BlogA___info')) - assert x == expected1 or x == expected2 + self.assertTrue(x == expected1 or x == expected2) def test_limit_choices_to(self): @@ -306,15 +307,16 @@ class testclass(TestCase): a=qs[0] b=qs[1] c=qs[2] - assert len(qs)==3 - assert type(a.uuid_primary_key)==uuid.UUID and type(a.pk)==uuid.UUID + self.assertEqual(len(qs), 3) + self.assertIsInstance(a.uuid_primary_key, uuid.UUID) + self.assertIsInstance(a.pk, uuid.UUID) res=repr(qs) import re res=re.sub(' "(.*?)..", topic',', topic',res) res_exp="""[ , , ]""" - assert res==res_exp, res + self.assertEqual(res, res_exp) #if (a.pk!= uuid.UUID or c.pk!= uuid.UUID): # print # print '# known inconstency with custom primary key field detected (django problem?)' @@ -323,7 +325,7 @@ class testclass(TestCase): b=UUIDPlainB.objects.create(field1='B1', field2='B2') c=UUIDPlainC.objects.create(field1='C1', field2='C2', field3='C3') qs=UUIDPlainA.objects.all() - if (a.pk!= uuid.UUID or c.pk!= uuid.UUID): + if a.pk!= uuid.UUID or c.pk!= uuid.UUID: print print '# known type inconstency with custom primary key field detected (django problem?)' From 25aa32d7bd9af7f0b863eda577413eb2308f15bc Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 11:33:41 +0200 Subject: [PATCH 06/10] Replaced the doctests with unit tests Making debugging tests much easier. The same repr() logic is preserved, so this is essentually a huge coding style change. --- polymorphic/tests.py | 506 ++++++++++++++++++++++--------------------- 1 file changed, 258 insertions(+), 248 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 0c4c93f..a4bf8b4 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -201,16 +201,21 @@ class RelatedNameClash(ShowFieldType, PolymorphicModel): ctype = models.ForeignKey(ContentType, null=True, editable=False) -class testclass(TestCase): +class PolymorphicTests(TestCase): + """ + The test suite + """ + def test_diamond_inheritance(self): # Django diamond problem - o = DiamondXY.objects.create(field_b='b', field_x='x', field_y='y') - print 'DiamondXY fields 1: field_b "%s", field_x "%s", field_y "%s"' % (o.field_b, o.field_x, o.field_y) - o = DiamondXY.objects.get() - print 'DiamondXY fields 2: field_b "%s", field_x "%s", field_y "%s"' % (o.field_b, o.field_x, o.field_y) - if o.field_b != 'b': + o1 = DiamondXY.objects.create(field_b='b', field_x='x', field_y='y') + o2 = DiamondXY.objects.get() + + if o2.field_b != 'b': print print '# known django model inheritance diamond problem detected' + print 'DiamondXY fields 1: field_b "{0}", field_x "{1}", field_y "{2}"'.format(o1.field_b, o1.field_x, o1.field_y) + print 'DiamondXY fields 2: field_b "{0}", field_x "{1}", field_y "{2}"'.format(o2.field_b, o2.field_x, o2.field_y) def test_annotate_aggregate_order(self): @@ -330,300 +335,305 @@ class testclass(TestCase): print '# known type inconstency with custom primary key field detected (django problem?)' -def show_base_manager(model): - print type(model._base_manager),model._base_manager.model - -__test__ = {"doctest": """ -####################################################### -### Tests - ->>> settings.DEBUG=True - - -### simple inheritance - ->>> o=Model2A.objects.create(field1='A1') ->>> o=Model2B.objects.create(field1='B1', field2='B2') ->>> o=Model2C.objects.create(field1='C1', field2='C2', field3='C3') ->>> o=Model2D.objects.create(field1='D1', field2='D2', field3='D3', field4='D4') ->>> Model2A.objects.all() -[ , - , - , - ] - -# manual get_real_instance() ->>> o=Model2A.objects.non_polymorphic().get(field1='C1') ->>> o.get_real_instance() - - -# non_polymorphic() ->>> qs=Model2A.objects.all().non_polymorphic() ->>> qs -[ , - , - , - ] - -# get_real_instances() ->>> qs.get_real_instances() -[ , - , - , - ] - ->>> l=list(qs) ->>> Model2A.objects.get_real_instances(l) -[ , - , - , - ] - -# translate_polymorphic_Q_object ->>> q=Model2A.translate_polymorphic_Q_object( Q(instance_of=Model2C) ) ->>> Model2A.objects.filter(q) -[ , - ] - - -### test inheritance pointers & _base_managers - ->>> show_base_manager(PlainA) - ->>> show_base_manager(PlainB) - ->>> show_base_manager(PlainC) - ->>> show_base_manager(Model2A) - ->>> show_base_manager(Model2B) - ->>> show_base_manager(Model2C) - ->>> show_base_manager(One2OneRelatingModel) - ->>> show_base_manager(One2OneRelatingModelDerived) - - ->>> o=Model2A.base_objects.get(field1='C1') ->>> o.model2b - - ->>> o=Model2B.base_objects.get(field1='C1') ->>> o.model2c - - - -### OneToOneField, test both directions for polymorphism - ->>> a=Model2A.base_objects.get(field1='C1') ->>> b=One2OneRelatingModelDerived.objects.create(one2one=a, field1='f1', field2='f2') ->>> b.one2one # this result is basically wrong, probably due to Django cacheing (we used base_objects), but should not be a problem - ->>> c=One2OneRelatingModelDerived.objects.get(field1='f1') ->>> c.one2one - - ->>> a.one2onerelatingmodel - - - -### ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent, also with annotate() - ->>> o=ModelShow1.objects.create(field1='abc') ->>> o.m2m.add(o) ; o.save() ->>> ModelShow1.objects.all() -[ ] - ->>> o=ModelShow2.objects.create(field1='abc') ->>> o.m2m.add(o) ; o.save() ->>> ModelShow2.objects.all() -[ ] - ->>> o=ModelShow3.objects.create(field1='abc') ->>> o.m2m.add(o) ; o.save() ->>> ModelShow3.objects.all() -[ ] - ->>> ModelShow1.objects.all().annotate(Count('m2m')) -[ ] ->>> ModelShow2.objects.all().annotate(Count('m2m')) -[ ] ->>> ModelShow3.objects.all().annotate(Count('m2m')) -[ ] - -# no pretty printing ->>> o=ModelShow1_plain.objects.create(field1='abc') ->>> o=ModelShow2_plain.objects.create(field1='abc', field2='def') ->>> ModelShow1_plain.objects.all() -[, ] + def create_model2abcd(self): + """ + Create the chain of objects of Model2, + this is reused in various tests. + """ + Model2A.objects.create(field1='A1') + Model2B.objects.create(field1='B1', field2='B2') + Model2C.objects.create(field1='C1', field2='C2', field3='C3') + Model2D.objects.create(field1='D1', field2='D2', field3='D3', field4='D4') -### extra() method + def test_simple_inheritance(self): + self.create_model2abcd() ->>> Model2A.objects.extra(where=['id IN (2, 3)']) -[ , - ] + objects = list(Model2A.objects.all()) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(repr(objects[3]), '') ->>> Model2A.objects.extra(select={"select_test": "field1 = 'A1'"}, where=["field1 = 'A1' OR field1 = 'B1'"], order_by = ['-id'] ) -[ , - ] ->>> o=ModelExtraA.objects.create(field1='A1') ->>> o=ModelExtraB.objects.create(field1='B1', field2='B2') ->>> o=ModelExtraC.objects.create(field1='C1', field2='C2', field3='C3') ->>> o=ModelExtraExternal.objects.create(topic='extra1') ->>> o=ModelExtraExternal.objects.create(topic='extra2') ->>> o=ModelExtraExternal.objects.create(topic='extra3') ->>> ModelExtraA.objects.extra(tables=["polymorphic_modelextraexternal"], select={"topic":"polymorphic_modelextraexternal.topic"}, where=["polymorphic_modelextraa.id = polymorphic_modelextraexternal.id"] ) -[ , - , - ] + def test_manual_get_real_instance(self): + self.create_model2abcd() -### class filtering, instance_of, not_instance_of + o = Model2A.objects.non_polymorphic().get(field1='C1') + self.assertEqual(repr(o.get_real_instance()), '') ->>> Model2A.objects.instance_of(Model2B) -[ , - , - ] ->>> Model2A.objects.filter(instance_of=Model2B) -[ , - , - ] + def test_non_polymorphic(self): + self.create_model2abcd() ->>> Model2A.objects.filter(Q(instance_of=Model2B)) -[ , - , - ] + objects = list(Model2A.objects.all().non_polymorphic()) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(repr(objects[3]), '') ->>> Model2A.objects.not_instance_of(Model2B) -[ ] + def test_get_real_instances(self): + self.create_model2abcd() + qs = Model2A.objects.all().non_polymorphic() -### polymorphic filtering + # from queryset + objects = qs.get_real_instances() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(repr(objects[3]), '') ->>> Model2A.objects.filter( Q( Model2B___field2 = 'B2' ) | Q( Model2C___field3 = 'C3' ) ) -[ , - ] + # from a manual list + objects = Model2A.objects.get_real_instances(list(qs)) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(repr(objects[3]), '') + + + def test_translate_polymorphic_q_object(self): + self.create_model2abcd() + q = Model2A.translate_polymorphic_Q_object(Q(instance_of=Model2C)) + objects = Model2A.objects.filter(q) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') -### get & delete ->>> oa=Model2A.objects.get(id=2) ->>> oa - + def test_base_manager(self): + def show_base_manager(model): + return "{0} {1}".format( + repr(type(model._base_manager)), + repr(model._base_manager.model) + ) + + self.assertEqual(show_base_manager(PlainA), " ") + self.assertEqual(show_base_manager(PlainB), " ") + self.assertEqual(show_base_manager(PlainC), " ") + self.assertEqual(show_base_manager(Model2A), " ") + self.assertEqual(show_base_manager(Model2B), " ") + self.assertEqual(show_base_manager(Model2C), " ") + self.assertEqual(show_base_manager(One2OneRelatingModel), " ") + self.assertEqual(show_base_manager(One2OneRelatingModelDerived), " ") + + + def test_foreignkey_field(self): + self.create_model2abcd() ->>> oa.delete() ->>> Model2A.objects.all() -[ , - , - ] + object2a = Model2A.base_objects.get(field1='C1') + self.assertEqual(repr(object2a.model2b), '') + object2b = Model2B.base_objects.get(field1='C1') + self.assertEqual(repr(object2b.model2c), '') + + + def test_onetoone_field(self): + self.create_model2abcd() -### queryset combining + a = Model2A.base_objects.get(field1='C1') + b = One2OneRelatingModelDerived.objects.create(one2one=a, field1='f1', field2='f2') ->>> o=ModelX.objects.create(field_x='x') ->>> o=ModelY.objects.create(field_y='y') + # this result is basically wrong, probably due to Django cacheing (we used base_objects), but should not be a problem + self.assertEqual(repr(b.one2one), '') ->>> Base.objects.instance_of(ModelX) | Base.objects.instance_of(ModelY) -[ , - ] + c = One2OneRelatingModelDerived.objects.get(field1='f1') + self.assertEqual(repr(c.one2one), '') + self.assertEqual(repr(a.one2onerelatingmodel), '') -### multiple inheritance, subclassing third party models (mix PolymorphicModel with models.Model) + def test_manytomany_field(self): + # Model 1 + o = ModelShow1.objects.create(field1='abc') + o.m2m.add(o) + o.save() + self.assertEqual(repr(ModelShow1.objects.all()), '[ ]') ->>> o = Enhance_Base.objects.create(field_b='b-base') ->>> o = Enhance_Inherit.objects.create(field_b='b-inherit', field_p='p', field_i='i') + # Model 2 + o = ModelShow2.objects.create(field1='abc') + o.m2m.add(o) + o.save() + self.assertEqual(repr(ModelShow2.objects.all()), '[ ]') ->>> Enhance_Base.objects.all() -[ , - ] + # Model 3 + o=ModelShow3.objects.create(field1='abc') + o.m2m.add(o) + o.save() + self.assertEqual(repr(ModelShow3.objects.all()), '[ ]') + self.assertEqual(repr(ModelShow1.objects.all().annotate(Count('m2m'))), '[ ]') + self.assertEqual(repr(ModelShow2.objects.all().annotate(Count('m2m'))), '[ ]') + self.assertEqual(repr(ModelShow3.objects.all().annotate(Count('m2m'))), '[ ]') + # no pretty printing + ModelShow1_plain.objects.create(field1='abc') + ModelShow2_plain.objects.create(field1='abc', field2='def') + self.assertEqual(repr(ModelShow1_plain.objects.all()), '[, ]') -### ForeignKey, ManyToManyField ->>> obase=RelationBase.objects.create(field_base='base') ->>> oa=RelationA.objects.create(field_base='A1', field_a='A2', fk=obase) ->>> ob=RelationB.objects.create(field_base='B1', field_b='B2', fk=oa) ->>> oc=RelationBC.objects.create(field_base='C1', field_b='C2', field_c='C3', fk=oa) ->>> oa.m2m.add(oa); oa.m2m.add(ob) + def test_extra_method(self): + self.create_model2abcd() ->>> RelationBase.objects.all() -[ , - , - , - ] + objects = list(Model2A.objects.extra(where=['id IN (2, 3)'])) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') ->>> oa=RelationBase.objects.get(id=2) ->>> oa.fk - + objects = Model2A.objects.extra(select={"select_test": "field1 = 'A1'"}, where=["field1 = 'A1' OR field1 = 'B1'"], order_by=['-id']) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(len(objects), 2) # Placed after the other tests, only verifying whether there are no more additional objects. + + ModelExtraA.objects.create(field1='A1') + ModelExtraB.objects.create(field1='B1', field2='B2') + ModelExtraC.objects.create(field1='C1', field2='C2', field3='C3') + ModelExtraExternal.objects.create(topic='extra1') + ModelExtraExternal.objects.create(topic='extra2') + ModelExtraExternal.objects.create(topic='extra3') + objects = ModelExtraA.objects.extra(tables=["polymorphic_modelextraexternal"], select={"topic":"polymorphic_modelextraexternal.topic"}, where=["polymorphic_modelextraa.id = polymorphic_modelextraexternal.id"]) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(len(objects), 3) ->>> oa.relationbase_set.all() -[ , - ] ->>> ob=RelationBase.objects.get(id=3) ->>> ob.fk - + def test_instance_of_filter(self): + self.create_model2abcd() + + objects = Model2A.objects.instance_of(Model2B) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(len(objects), 3) + + objects = Model2A.objects.filter(instance_of=Model2B) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(len(objects), 3) + + objects = Model2A.objects.filter(Q(instance_of=Model2B)) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(len(objects), 3) ->>> oa=RelationA.objects.get() ->>> oa.m2m.all() -[ , - ] + objects = Model2A.objects.not_instance_of(Model2B) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(len(objects), 1) -### user-defined manager ->>> o=ModelWithMyManager.objects.create(field1='D1a', field4='D4a') ->>> o=ModelWithMyManager.objects.create(field1='D1b', field4='D4b') + def test_polymorphic___filter(self): + self.create_model2abcd() ->>> ModelWithMyManager.objects.all() -[ , - ] + objects = Model2A.objects.filter(Q( Model2B___field2='B2') | Q( Model2C___field3='C3')) + self.assertEqual(len(objects), 2) + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') ->>> type(ModelWithMyManager.objects) - ->>> type(ModelWithMyManager._default_manager) - + def test_delete(self): + self.create_model2abcd() -### Manager Inheritance + oa = Model2A.objects.get(id=2) + self.assertEqual(repr(oa), '') + self.assertEqual(Model2A.objects.count(), 4) ->>> type(MRODerived.objects) # MRO - + oa.delete() + objects = Model2A.objects.all() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(len(objects), 3) + + + def test_combine_querysets(self): + ModelX.objects.create(field_x='x') + ModelY.objects.create(field_y='y') -# check for correct default manager ->>> type(MROBase1._default_manager) - + qs = Base.objects.instance_of(ModelX) | Base.objects.instance_of(ModelY) + self.assertEqual(repr(qs[0]), '') + self.assertEqual(repr(qs[1]), '') + self.assertEqual(len(qs), 2) -# Django vanilla inheritance does not inherit MyManager as _default_manager here ->>> type(MROBase2._default_manager) - + def test_multiple_inheritance(self): + # multiple inheritance, subclassing third party models (mix PolymorphicModel with models.Model) -### fixed issue in PolymorphicModel.__getattribute__: field name same as model name ->>> ModelFieldNameTest.objects.create(modelfieldnametest='1') - + Enhance_Base.objects.create(field_b='b-base') + Enhance_Inherit.objects.create(field_b='b-inherit', field_p='p', field_i='i') + qs = Enhance_Base.objects.all() + self.assertEqual(repr(qs[0]), '') + self.assertEqual(repr(qs[1]), '') + self.assertEqual(len(qs), 2) -### fixed issue in PolymorphicModel.__getattribute__: -# if subclass defined __init__ and accessed class members, __getattribute__ had a problem: "...has no attribute 'sub_and_superclass_dict'" -#>>> o ->>> o = InitTestModelSubclass.objects.create() ->>> o.bar -'XYZ' + def test_relation_base(self): + # ForeignKey, ManyToManyField + obase = RelationBase.objects.create(field_base='base') + oa = RelationA.objects.create(field_base='A1', field_a='A2', fk=obase) + ob = RelationB.objects.create(field_base='B1', field_b='B2', fk=oa) + oc = RelationBC.objects.create(field_base='C1', field_b='C2', field_c='C3', fk=oa) + oa.m2m.add(oa) + oa.m2m.add(ob) -### Django model inheritance diamond problem, fails for Django 1.1 + objects = RelationBase.objects.all() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(repr(objects[2]), '') + self.assertEqual(repr(objects[3]), '') + self.assertEqual(len(objects), 4) -#>>> o=DiamondXY.objects.create(field_b='b', field_x='x', field_y='y') -#>>> print 'DiamondXY fields 1: field_b "%s", field_x "%s", field_y "%s"' % (o.field_b, o.field_x, o.field_y) -#DiamondXY fields 1: field_b "a", field_x "x", field_y "y" + oa = RelationBase.objects.get(id=2) + self.assertEqual(repr(oa.fk), '') + objects = oa.relationbase_set.all() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(len(objects), 2) ->>> settings.DEBUG=False + ob = RelationBase.objects.get(id=3) + self.assertEqual(repr(ob.fk), '') -"""} + oa = RelationA.objects.get() + objects = oa.m2m.all() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(len(objects), 2) + + + def test_user_defined_manager(self): + self.create_model2abcd() + ModelWithMyManager.objects.create(field1='D1a', field4='D4a') + ModelWithMyManager.objects.create(field1='D1b', field4='D4b') + + objects = ModelWithMyManager.objects.all() + self.assertEqual(repr(objects[0]), '') + self.assertEqual(repr(objects[1]), '') + self.assertEqual(len(objects), 2) + + self.assertEqual(repr(type(ModelWithMyManager.objects)), "") + self.assertEqual(repr(type(ModelWithMyManager._default_manager)), "") + + + def test_manager_inheritance(self): + self.assertEqual(repr(type(MRODerived.objects)), "") # MRO + + # check for correct default manager + self.assertEqual(repr(type(MROBase1._default_manager)), "") + + # Django vanilla inheritance does not inherit MyManager as _default_manager here + self.assertEqual(repr(type(MROBase2._default_manager)), "") + + + def test_fix_getattribute(self): + ### fixed issue in PolymorphicModel.__getattribute__: field name same as model name + o = ModelFieldNameTest.objects.create(modelfieldnametest='1') + self.assertEqual(repr(o), '') + + # if subclass defined __init__ and accessed class members, + # __getattribute__ had a problem: "...has no attribute 'sub_and_superclass_dict'" + o = InitTestModelSubclass.objects.create() + self.assertEqual(o.bar, 'XYZ') class RegressionTests(TestCase): From 2d83124f514321ca0621fe9bb464cab187233b92 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 11:38:56 +0200 Subject: [PATCH 07/10] Tests: remove Django 1.1 compatibility check --- polymorphic/tests.py | 38 ++++++++++++++++---------------------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index a4bf8b4..bab523c 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -6,6 +6,7 @@ from django.conf import settings import sys from pprint import pprint +import uuid from django import VERSION as django_VERSION from django.conf import settings @@ -18,6 +19,7 @@ from django.contrib.contenttypes.models import ContentType from polymorphic import PolymorphicModel, PolymorphicManager, PolymorphicQuerySet from polymorphic import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent, get_version from polymorphic import translate_polymorphic_Q_object +from polymorphic.tools_for_tests import UUIDField class PlainA(models.Model): field1 = models.CharField(max_length=10) @@ -166,28 +168,21 @@ class Bottom(Middle): author = models.CharField(max_length=50) -# UUID tests won't work with Django 1.1 -if not (django_VERSION[0] <= 1 and django_VERSION[1] <= 1): - try: from polymorphic.tools_for_tests import UUIDField - except: pass - if 'UUIDField' in globals(): - import uuid +class UUIDProject(ShowFieldTypeAndContent, PolymorphicModel): + uuid_primary_key = UUIDField(primary_key = True) + topic = models.CharField(max_length = 30) +class UUIDArtProject(UUIDProject): + artist = models.CharField(max_length = 30) +class UUIDResearchProject(UUIDProject): + supervisor = models.CharField(max_length = 30) - class UUIDProject(ShowFieldTypeAndContent, PolymorphicModel): - uuid_primary_key = UUIDField(primary_key = True) - topic = models.CharField(max_length = 30) - class UUIDArtProject(UUIDProject): - artist = models.CharField(max_length = 30) - class UUIDResearchProject(UUIDProject): - supervisor = models.CharField(max_length = 30) - - class UUIDPlainA(models.Model): - uuid_primary_key = UUIDField(primary_key = True) - field1 = models.CharField(max_length=10) - class UUIDPlainB(UUIDPlainA): - field2 = models.CharField(max_length=10) - class UUIDPlainC(UUIDPlainB): - field3 = models.CharField(max_length=10) +class UUIDPlainA(models.Model): + uuid_primary_key = UUIDField(primary_key = True) + field1 = models.CharField(max_length=10) +class UUIDPlainB(UUIDPlainA): + field2 = models.CharField(max_length=10) +class UUIDPlainC(UUIDPlainB): + field3 = models.CharField(max_length=10) # test bad field name @@ -303,7 +298,6 @@ class PolymorphicTests(TestCase): def test_primary_key_custom_field_problem(self): "object retrieval problem occuring with some custom primary key fields (UUIDField as test case)" - if not 'UUIDField' in globals(): return a=UUIDProject.objects.create(topic="John's gathering") b=UUIDArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner") c=UUIDResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter") From 7ca328f9e49b4829729fbd34749618f192c9a25c Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 11:39:33 +0200 Subject: [PATCH 08/10] Tests: auto removed unused imports --- polymorphic/tests.py | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index bab523c..c8ec3da 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -2,25 +2,18 @@ """ Test Cases Please see README.rst or DOCS.rst or http://chrisglass.github.com/django_polymorphic/ """ - -from django.conf import settings -import sys -from pprint import pprint import uuid -from django import VERSION as django_VERSION -from django.conf import settings from django.test import TestCase -from django.db.models.query import QuerySet from django.db.models import Q,Count from django.db import models from django.contrib.contenttypes.models import ContentType -from polymorphic import PolymorphicModel, PolymorphicManager, PolymorphicQuerySet -from polymorphic import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent, get_version -from polymorphic import translate_polymorphic_Q_object +from polymorphic import PolymorphicModel, PolymorphicManager +from polymorphic import ShowFieldContent, ShowFieldType, ShowFieldTypeAndContent from polymorphic.tools_for_tests import UUIDField + class PlainA(models.Model): field1 = models.CharField(max_length=10) class PlainB(PlainA): From ebced5f4ebc854b8485cd68eb6007ca89c3a35f8 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 11:45:07 +0200 Subject: [PATCH 09/10] Tests: make old code more readable --- polymorphic/tests.py | 73 ++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index c8ec3da..2992186 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -3,6 +3,7 @@ Please see README.rst or DOCS.rst or http://chrisglass.github.com/django_polymorphic/ """ import uuid +import re from django.test import TestCase from django.db.models import Q,Count @@ -205,25 +206,23 @@ class PolymorphicTests(TestCase): print 'DiamondXY fields 1: field_b "{0}", field_x "{1}", field_y "{2}"'.format(o1.field_b, o1.field_x, o1.field_y) print 'DiamondXY fields 2: field_b "{0}", field_x "{1}", field_y "{2}"'.format(o2.field_b, o2.field_x, o2.field_y) + def test_annotate_aggregate_order(self): - # create a blog of type BlogA - blog = BlogA.objects.create(name='B1', info='i1') # create two blog entries in BlogA - entry1 = blog.blogentry_set.create(text='bla') - entry2 = BlogEntry.objects.create(blog=blog, text='bla2') - # create some blogs of type BlogB to make the BlogBase table data really polymorphic - o = BlogB.objects.create(name='Bb1') - o = BlogB.objects.create(name='Bb2') - o = BlogB.objects.create(name='Bb3') + blog = BlogA.objects.create(name='B1', info='i1') + blog.blogentry_set.create(text='bla') + BlogEntry.objects.create(blog=blog, text='bla2') + BlogB.objects.create(name='Bb1') + BlogB.objects.create(name='Bb2') + BlogB.objects.create(name='Bb3') qs = BlogBase.objects.annotate(entrycount=Count('BlogA___blogentry')) - self.assertEqual(len(qs), 4) for o in qs: - if o.name=='B1': + if o.name == 'B1': self.assertEqual(o.entrycount, 2) else: self.assertEqual(o.entrycount, 0) @@ -232,13 +231,12 @@ class PolymorphicTests(TestCase): self.assertEqual(x['entrycount'], 2) # create some more blogs for next test - b2 = BlogA.objects.create(name='B2', info='i2') - b2 = BlogA.objects.create(name='B3', info='i3') - b2 = BlogA.objects.create(name='B4', info='i4') - b2 = BlogA.objects.create(name='B5', info='i5') - - ### test ordering for field in all entries + BlogA.objects.create(name='B2', info='i2') + BlogA.objects.create(name='B3', info='i3') + BlogA.objects.create(name='B4', info='i4') + BlogA.objects.create(name='B5', info='i5') + # test ordering for field in all entries expected = ''' [ , , @@ -251,8 +249,7 @@ class PolymorphicTests(TestCase): x = '\n' + repr(BlogBase.objects.order_by('-name')) self.assertEqual(x, expected) - ### test ordering for field in one subclass only - + # test ordering for field in one subclass only # MySQL and SQLite return this order expected1=''' [ , @@ -280,7 +277,9 @@ class PolymorphicTests(TestCase): def test_limit_choices_to(self): - "this is not really a testcase, as limit_choices_to only affects the Django admin" + """ + this is not really a testcase, as limit_choices_to only affects the Django admin + """ # create a blog of type BlogA blog_a = BlogA.objects.create(name='aa', info='aa') blog_b = BlogB.objects.create(name='bb') @@ -290,22 +289,24 @@ class PolymorphicTests(TestCase): def test_primary_key_custom_field_problem(self): - "object retrieval problem occuring with some custom primary key fields (UUIDField as test case)" - a=UUIDProject.objects.create(topic="John's gathering") - b=UUIDArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner") - c=UUIDResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter") - qs=UUIDProject.objects.all() - ol=list(qs) - a=qs[0] - b=qs[1] - c=qs[2] + """ + object retrieval problem occuring with some custom primary key fields (UUIDField as test case) + """ + UUIDProject.objects.create(topic="John's gathering") + UUIDArtProject.objects.create(topic="Sculpting with Tim", artist="T. Turner") + UUIDResearchProject.objects.create(topic="Swallow Aerodynamics", supervisor="Dr. Winter") + + qs = UUIDProject.objects.all() + ol = list(qs) + a = qs[0] + b = qs[1] + c = qs[2] self.assertEqual(len(qs), 3) self.assertIsInstance(a.uuid_primary_key, uuid.UUID) self.assertIsInstance(a.pk, uuid.UUID) - res=repr(qs) - import re - res=re.sub(' "(.*?)..", topic',', topic',res) - res_exp="""[ , + + res = re.sub(' "(.*?)..", topic',', topic', repr(res)) + res_exp = """[ , , ]""" self.assertEqual(res, res_exp) @@ -313,10 +314,10 @@ class PolymorphicTests(TestCase): # print # print '# known inconstency with custom primary key field detected (django problem?)' - a=UUIDPlainA.objects.create(field1='A1') - b=UUIDPlainB.objects.create(field1='B1', field2='B2') - c=UUIDPlainC.objects.create(field1='C1', field2='C2', field3='C3') - qs=UUIDPlainA.objects.all() + a = UUIDPlainA.objects.create(field1='A1') + b = UUIDPlainB.objects.create(field1='B1', field2='B2') + c = UUIDPlainC.objects.create(field1='C1', field2='C2', field3='C3') + qs = UUIDPlainA.objects.all() if a.pk!= uuid.UUID or c.pk!= uuid.UUID: print print '# known type inconstency with custom primary key field detected (django problem?)' From e411660b806f129db80af1c220b35d5e1d177272 Mon Sep 17 00:00:00 2001 From: Diederik van der Boor Date: Fri, 5 Apr 2013 12:01:37 +0200 Subject: [PATCH 10/10] Tests: fix missed error in last commit (cannot amend, already pushed for review) --- polymorphic/tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/polymorphic/tests.py b/polymorphic/tests.py index 2992186..7d62d33 100644 --- a/polymorphic/tests.py +++ b/polymorphic/tests.py @@ -305,7 +305,7 @@ class PolymorphicTests(TestCase): self.assertIsInstance(a.uuid_primary_key, uuid.UUID) self.assertIsInstance(a.pk, uuid.UUID) - res = re.sub(' "(.*?)..", topic',', topic', repr(res)) + res = re.sub(' "(.*?)..", topic',', topic', repr(qs)) res_exp = """[ , , ]"""