Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fixed a test case that was failing in Oracle due to conflation of nul…

…l and empty strings.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14547 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 8a7a44ffa2c1c860b80dee8c2c1d0c2442fcd4f8 1 parent 9892f4c
@ikelly ikelly authored
View
8 tests/regressiontests/fixtures_regress/models.py
@@ -28,13 +28,7 @@ class Stuff(models.Model):
owner = models.ForeignKey(User, null=True)
def __unicode__(self):
- # Oracle doesn't distinguish between None and the empty string.
- # This hack makes the test case pass using Oracle.
- name = self.name
- if (connection.features.interprets_empty_strings_as_nulls
- and name == u''):
- name = None
- return unicode(name) + u' is owned by ' + unicode(self.owner)
+ return unicode(self.name) + u' is owned by ' + unicode(self.owner)
class Absolute(models.Model):
View
20 tests/regressiontests/fixtures_regress/tests.py
@@ -13,7 +13,8 @@
from django.core.management.base import CommandError
from django.db.models import signals
from django.db import transaction
-from django.test import TestCase, TransactionTestCase
+from django.test import TestCase, TransactionTestCase, skipIfDBFeature, \
+ skipUnlessDBFeature
from models import Animal, Stuff
from models import Absolute, Parent, Child
@@ -61,6 +62,7 @@ def test_duplicate_pk(self):
animal.save()
self.assertGreater(animal.id, 1)
+ @skipIfDBFeature('interprets_empty_strings_as_nulls')
def test_pretty_print_xml(self):
"""
Regression test for ticket #4558 -- pretty printing of XML fixtures
@@ -76,6 +78,22 @@ def test_pretty_print_xml(self):
self.assertEqual(Stuff.objects.all()[0].name, None)
self.assertEqual(Stuff.objects.all()[0].owner, None)
+ @skipUnlessDBFeature('interprets_empty_strings_as_nulls')
+ def test_pretty_print_xml_empty_strings(self):
+ """
+ Regression test for ticket #4558 -- pretty printing of XML fixtures
+ doesn't affect parsing of None values.
+ """
+ # Load a pretty-printed XML fixture with Nulls.
+ management.call_command(
+ 'loaddata',
+ 'pretty.xml',
+ verbosity=0,
+ commit=False
+ )
+ self.assertEqual(Stuff.objects.all()[0].name, u'')
+ self.assertEqual(Stuff.objects.all()[0].owner, None)
+
def test_absolute_path(self):
"""
Regression test for ticket #6436 --
Please sign in to comment.
Something went wrong with that request. Please try again.