[soc2010/app-loading] merged trunkarchive/soc2010/app-loading

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/app-loading@13818 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 52 insertions, 62 deletions

diff --git a/tests/modeltests/get_or_create/models.py b/tests/modeltests/get_or_create/models.py
index 56baa5c1ed..db5719b79e 100644
--- a/tests/modeltests/get_or_create/models.py
+++ b/tests/modeltests/get_or_create/models.py
@@ -19,65 +19,3 @@ class Person(models.Model):
 class ManualPrimaryKeyTest(models.Model):
     id = models.IntegerField(primary_key=True)
     data = models.CharField(max_length=100)
-
-__test__ = {'API_TESTS':"""
-# Acting as a divine being, create an Person.
->>> from datetime import date
->>> p = Person(first_name='John', last_name='Lennon', birthday=date(1940, 10, 9))
->>> p.save()
-
-# Only one Person is in the database at this point.
->>> Person.objects.count()
-1
-
-# get_or_create() a person with similar first names.
->>> p, created = Person.objects.get_or_create(first_name='John', last_name='Lennon', defaults={'birthday': date(1940, 10, 9)})
-
-# get_or_create() didn't have to create an object.
->>> created
-False
-
-# There's still only one Person in the database.
->>> Person.objects.count()
-1
-
-# get_or_create() a Person with a different name.
->>> p, created = Person.objects.get_or_create(first_name='George', last_name='Harrison', defaults={'birthday': date(1943, 2, 25)})
->>> created
-True
->>> Person.objects.count()
-2
-
-# If we execute the exact same statement, it won't create a Person.
->>> p, created = Person.objects.get_or_create(first_name='George', last_name='Harrison', defaults={'birthday': date(1943, 2, 25)})
->>> created
-False
->>> Person.objects.count()
-2
-
-# If you don't specify a value or default value for all required fields, you
-# will get an error.
->>> try:
-...     p, created = Person.objects.get_or_create(first_name='Tom', last_name='Smith')
-... except Exception, e:
-...     if isinstance(e, IntegrityError):
-...         print "Pass"
-...     else:
-...         print "Fail with %s" % type(e)
-Pass
-
-# If you specify an existing primary key, but different other fields, then you
-# will get an error and data will not be updated.
->>> m = ManualPrimaryKeyTest(id=1, data='Original')
->>> m.save()
->>> try:
-...    m, created = ManualPrimaryKeyTest.objects.get_or_create(id=1, data='Different')
-... except Exception, e:
-...    if isinstance(e, IntegrityError):
-...        print "Pass"
-...    else:
-...        print "Fail with %s" % type(e)
-Pass
->>> ManualPrimaryKeyTest.objects.get(id=1).data == 'Original'
-True
-"""}
diff --git a/tests/modeltests/get_or_create/tests.py b/tests/modeltests/get_or_create/tests.py
new file mode 100644
index 0000000000..1999b20c76
--- /dev/null
+++ b/tests/modeltests/get_or_create/tests.py
@@ -0,0 +1,52 @@
+from datetime import date
+
+from django.db import IntegrityError
+from django.test import TransactionTestCase
+
+from models import Person, ManualPrimaryKeyTest
+
+
+class GetOrCreateTests(TransactionTestCase):
+    def test_get_or_create(self):
+        p = Person.objects.create(
+            first_name='John', last_name='Lennon', birthday=date(1940, 10, 9)
+        )
+
+        p, created = Person.objects.get_or_create(
+            first_name="John", last_name="Lennon", defaults={
+                "birthday": date(1940, 10, 9)
+            }
+        )
+        self.assertFalse(created)
+        self.assertEqual(Person.objects.count(), 1)
+
+        p, created = Person.objects.get_or_create(
+            first_name='George', last_name='Harrison', defaults={
+                'birthday': date(1943, 2, 25)
+            }
+        )
+        self.assertTrue(created)
+        self.assertEqual(Person.objects.count(), 2)
+
+        # If we execute the exact same statement, it won't create a Person.
+        p, created = Person.objects.get_or_create(
+            first_name='George', last_name='Harrison', defaults={
+                'birthday': date(1943, 2, 25)
+            }
+        )
+        self.assertFalse(created)
+        self.assertEqual(Person.objects.count(), 2)
+
+        # If you don't specify a value or default value for all required
+        # fields, you will get an error.
+        self.assertRaises(IntegrityError,
+            Person.objects.get_or_create, first_name="Tom", last_name="Smith"
+        )
+
+        # If you specify an existing primary key, but different other fields,
+        # then you will get an error and data will not be updated.
+        m = ManualPrimaryKeyTest.objects.create(id=1, data="Original")
+        self.assertRaises(IntegrityError,
+            ManualPrimaryKeyTest.objects.get_or_create, id=1, data="Different"
+        )
+        self.assertEqual(ManualPrimaryKeyTest.objects.get(id=1).data, "Original")