Author: PaulM
Date: 2010-06-23 09:12:45 -0500 (Wed, 23 Jun 2010)
New Revision: 13395
Added:
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/tests.py
Modified:
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/models.py
Log:
[soc2010/test-refactor] Converted force_insert_update to unittest. We have
always been at war with doctests.
Modified:
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/models.py
===================================================================
---
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/models.py
2010-06-23 13:20:38 UTC (rev 13394)
+++
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/models.py
2010-06-23 14:12:45 UTC (rev 13395)
@@ -2,7 +2,7 @@
Tests for forcing insert and update queries (instead of Django's normal
automatic behaviour).
"""
-from django.db import models, transaction, IntegrityError
+from django.db import models
class Counter(models.Model):
name = models.CharField(max_length = 10)
@@ -11,54 +11,3 @@
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: ...
-
-"""
-}
Added:
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/tests.py
===================================================================
---
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/tests.py
(rev 0)
+++
django/branches/soc2010/test-refactor/tests/modeltests/force_insert_update/tests.py
2010-06-23 14:12:45 UTC (rev 13395)
@@ -0,0 +1,49 @@
+from django.test import TestCase
+
+from models import Counter, WithCustomPK
+from django.db import DatabaseError, IntegrityError
+
+class ForceInsertUpdateTestCase(TestCase):
+ def test_normal_case(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)
+
+ def test_update_and_insert_simultaneously(self):
+ # Won't work because force_update and force_insert are
+ # mutually exclusive
+ c = Counter.objects.create(name="one", value=1)
+ self.assertRaises(ValueError,
+ c.save,
+ force_insert=True, force_update=True)
+
+ def test_update_with_no_pk(self):
+ # 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)
+
+ def test_insert_duplicate_pk(self):
+ # Won't work because we can't insert a pk of the same value.
+ c = Counter.objects.create(name="one", value=1)
+ c.value = 2
+ self.assertRaises(IntegrityError,
+ c.save,
+ force_insert=True)
+
+ def test_nonexistent_update(self):
+ # 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)
--
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to django-upda...@googlegroups.com.
To unsubscribe from this group, send email to
django-updates+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en.
