From f1f86e01731b81e11a7279e42fbc8cfe158069f1 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Sun, 12 Sep 2010 20:04:04 +0000 Subject: [PATCH] Migrated the force_insert_update tests. Thanks to Alex Gaynor. git-svn-id: http://code.djangoproject.com/svn/django/trunk@13782 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- .../modeltests/force_insert_update/models.py | 51 ------------------- tests/modeltests/force_insert_update/tests.py | 38 ++++++++++++++ 2 files changed, 38 insertions(+), 51 deletions(-) create mode 100644 tests/modeltests/force_insert_update/tests.py diff --git a/tests/modeltests/force_insert_update/models.py b/tests/modeltests/force_insert_update/models.py index 2489740e98..9516be7718 100644 --- a/tests/modeltests/force_insert_update/models.py +++ b/tests/modeltests/force_insert_update/models.py @@ -11,54 +11,3 @@ class Counter(models.Model): class WithCustomPK(models.Model): name = models.IntegerField(primary_key=True) value = models.IntegerField() - -__test__ = {"API_TESTS": """ ->>> c = Counter.objects.create(name="one", value=1) - -# The normal case ->>> c.value = 2 ->>> c.save() - -# Same thing, via an update ->>> c.value = 3 ->>> c.save(force_update=True) - -# Won't work because force_update and force_insert are mutually exclusive ->>> c.value = 4 ->>> c.save(force_insert=True, force_update=True) -Traceback (most recent call last): -... -ValueError: Cannot force both insert and updating in model saving. - -# Try to update something that doesn't have a primary key in the first place. ->>> c1 = Counter(name="two", value=2) ->>> c1.save(force_update=True) -Traceback (most recent call last): -... -ValueError: Cannot force an update in save() with no primary key. - ->>> c1.save(force_insert=True) - -# Won't work because we can't insert a pk of the same value. ->>> sid = transaction.savepoint() ->>> c.value = 5 ->>> try: -... c.save(force_insert=True) -... except Exception, e: -... if isinstance(e, IntegrityError): -... print "Pass" -... else: -... print "Fail with %s" % type(e) -Pass ->>> transaction.savepoint_rollback(sid) - -# Trying to update should still fail, even with manual primary keys, if the -# data isn't in the database already. ->>> obj = WithCustomPK(name=1, value=1) ->>> obj.save(force_update=True) -Traceback (most recent call last): -... -DatabaseError: ... - -""" -} diff --git a/tests/modeltests/force_insert_update/tests.py b/tests/modeltests/force_insert_update/tests.py new file mode 100644 index 0000000000..bd3eb7dcf6 --- /dev/null +++ b/tests/modeltests/force_insert_update/tests.py @@ -0,0 +1,38 @@ +from django.db import transaction, IntegrityError, DatabaseError +from django.test import TestCase + +from models import Counter, WithCustomPK + + +class ForceTests(TestCase): + def test_force_update(self): + c = Counter.objects.create(name="one", value=1) + # The normal case + + c.value = 2 + c.save() + # Same thing, via an update + c.value = 3 + c.save(force_update=True) + + # Won't work because force_update and force_insert are mutually + # exclusive + c.value = 4 + self.assertRaises(ValueError, c.save, force_insert=True, force_update=True) + + # Try to update something that doesn't have a primary key in the first + # place. + c1 = Counter(name="two", value=2) + self.assertRaises(ValueError, c1.save, force_update=True) + c1.save(force_insert=True) + + # Won't work because we can't insert a pk of the same value. + sid = transaction.savepoint() + c.value = 5 + self.assertRaises(IntegrityError, c.save, force_insert=True) + transaction.savepoint_rollback(sid) + + # Trying to update should still fail, even with manual primary keys, if + # the data isn't in the database already. + obj = WithCustomPK(name=1, value=1) + self.assertRaises(DatabaseError, obj.save, force_update=True)