make the test simpler by using a new doc class

mongoengine/base/datastructures.py

@@ -438,7 +438,7 @@ class StrictDict(object):
                 __slots__ = allowed_keys_tuple
 
                 def __repr__(self):
-                    return "{%s}" % ', '.join('"{0!s}": {1!r}'.format(k, v) for k, v in self.items())
+                    return "{%s}" % ', '.join('"{0!s}": {0!r}'.format(k) for k in self.iterkeys())
 
             cls._classes[allowed_keys] = SpecificStrictDict
         return cls._classes[allowed_keys]

mongoengine/base/document.py

@@ -121,7 +121,7 @@ class BaseDocument(object):
                 else:
                     self._data[key] = value
 
-        # Set any get_<field>_display methods
+        # Set any get_fieldname_display methods
         self.__set_field_display()
 
         if self._dynamic:
@@ -1005,18 +1005,19 @@ class BaseDocument(object):
         return '.'.join(parts)
 
     def __set_field_display(self):
-        """For each field that specifies choices, create a
-        get_<field>_display method.
-        """
-        fields_with_choices = [(n, f) for n, f in self._fields.items()
-                               if f.choices]
-        for attr_name, field in fields_with_choices:
-            setattr(self,
+        """Dynamically set the display value for a field with choices"""
+        for attr_name, field in self._fields.items():
+            if field.choices:
+                if self._dynamic:
+                    obj = self
+                else:
+                    obj = type(self)
+                setattr(obj,
                         'get_%s_display' % attr_name,
                         partial(self.__get_field_display, field=field))
 
     def __get_field_display(self, field):
-        """Return the display value for a choice field"""
+        """Returns the display value for a choice field"""
         value = getattr(self, field.name)
         if field.choices and isinstance(field.choices[0], (list, tuple)):
             return dict(field.choices).get(value, value)

mongoengine/fields.py

@@ -577,7 +577,7 @@ class EmbeddedDocumentField(BaseField):
         return self.document_type._fields.get(member_name)
 
     def prepare_query_value(self, op, value):
-        if value is not None and not isinstance(value, self.document_type):
+        if not isinstance(value, self.document_type):
             value = self.document_type._from_son(value)
         super(EmbeddedDocumentField, self).prepare_query_value(op, value)
         return self.to_mongo(value)

tests/document/indexes.py

@@ -2,8 +2,10 @@
 import unittest
 import sys
 
+sys.path[0:0] = [""]
 
 import pymongo
+from random import randint
 
 from nose.plugins.skip import SkipTest
 from datetime import datetime
@@ -15,9 +17,11 @@ __all__ = ("IndexesTest", )
 
 
 class IndexesTest(unittest.TestCase):
+    _MAX_RAND = 10 ** 10
 
     def setUp(self):
-        self.connection = connect(db='mongoenginetest')
+        self.db_name = 'mongoenginetest_IndexesTest_' + str(randint(0, self._MAX_RAND))
+        self.connection = connect(db=self.db_name)
         self.db = get_db()
 
         class Person(Document):

tests/fields/fields.py

@@ -3001,32 +3001,28 @@ class FieldTest(unittest.TestCase):
                 ('S', 'Small'), ('M', 'Medium'), ('L', 'Large'),
                 ('XL', 'Extra Large'), ('XXL', 'Extra Extra Large')))
             style = StringField(max_length=3, choices=(
-                ('S', 'Small'), ('B', 'Baggy'), ('W', 'Wide')), default='W')
+                ('S', 'Small'), ('B', 'Baggy'), ('W', 'wide')), default='S')
 
         Shirt.drop_collection()
 
-        shirt1 = Shirt()
-        shirt2 = Shirt()
+        shirt = Shirt()
 
-        # Make sure get_<field>_display returns the default value (or None)
-        self.assertEqual(shirt1.get_size_display(), None)
-        self.assertEqual(shirt1.get_style_display(), 'Wide')
+        self.assertEqual(shirt.get_size_display(), None)
+        self.assertEqual(shirt.get_style_display(), 'Small')
 
-        shirt1.size = 'XXL'
-        shirt1.style = 'B'
-        shirt2.size = 'M'
-        shirt2.style = 'S'
-        self.assertEqual(shirt1.get_size_display(), 'Extra Extra Large')
-        self.assertEqual(shirt1.get_style_display(), 'Baggy')
-        self.assertEqual(shirt2.get_size_display(), 'Medium')
-        self.assertEqual(shirt2.get_style_display(), 'Small')
+        shirt.size = "XXL"
+        shirt.style = "B"
+        self.assertEqual(shirt.get_size_display(), 'Extra Extra Large')
+        self.assertEqual(shirt.get_style_display(), 'Baggy')
 
         # Set as Z - an invalid choice
-        shirt1.size = 'Z'
-        shirt1.style = 'Z'
-        self.assertEqual(shirt1.get_size_display(), 'Z')
-        self.assertEqual(shirt1.get_style_display(), 'Z')
-        self.assertRaises(ValidationError, shirt1.validate)
+        shirt.size = "Z"
+        shirt.style = "Z"
+        self.assertEqual(shirt.get_size_display(), 'Z')
+        self.assertEqual(shirt.get_style_display(), 'Z')
+        self.assertRaises(ValidationError, shirt.validate)
+
+        Shirt.drop_collection()
 
     def test_simple_choices_validation(self):
         """Ensure that value is in a container of allowed values.

tests/queryset/queryset.py

@@ -1238,8 +1238,7 @@ class QuerySetTest(unittest.TestCase):
             self.assertFalse('$orderby' in q.get_ops()[0]['query'])
 
     def test_find_embedded(self):
-        """Ensure that an embedded document is properly returned from
-        a query.
+        """Ensure that an embedded document is properly returned from a query.
         """
         class User(EmbeddedDocument):
             name = StringField()
@@ -1250,31 +1249,16 @@ class QuerySetTest(unittest.TestCase):
 
         BlogPost.drop_collection()
 
-        BlogPost.objects.create(
-            author=User(name='Test User'),
-            content='Had a good coffee today...'
-        )
+        post = BlogPost(content='Had a good coffee today...')
+        post.author = User(name='Test User')
+        post.save()
 
         result = BlogPost.objects.first()
         self.assertTrue(isinstance(result.author, User))
         self.assertEqual(result.author.name, 'Test User')
 
-    def test_find_empty_embedded(self):
-        """Ensure that you can save and find an empty embedded document."""
-        class User(EmbeddedDocument):
-            name = StringField()
-
-        class BlogPost(Document):
-            content = StringField()
-            author = EmbeddedDocumentField(User)
-
         BlogPost.drop_collection()
 
-        BlogPost.objects.create(content='Anonymous post...')
-
-        result = BlogPost.objects.get(author=None)
-        self.assertEqual(result.author, None)
-
     def test_find_dict_item(self):
         """Ensure that DictField items may be found.
         """

tests/test_datastructures.py

@@ -1,5 +1,4 @@
 import unittest
-
 from mongoengine.base.datastructures import StrictDict, SemiStrictDict 
 
 
@@ -14,14 +13,6 @@ class TestStrictDict(unittest.TestCase):
         d = self.dtype(a=1, b=1, c=1)
         self.assertEqual((d.a, d.b, d.c), (1, 1, 1))
 
-    def test_repr(self):
-        d = self.dtype(a=1, b=2, c=3)
-        self.assertEqual(repr(d), '{"a": 1, "b": 2, "c": 3}')
-
-        # make sure quotes are escaped properly
-        d = self.dtype(a='"', b="'", c="")
-        self.assertEqual(repr(d), '{"a": \'"\', "b": "\'", "c": \'\'}')
-
     def test_init_fails_on_nonexisting_attrs(self):
         self.assertRaises(AttributeError, lambda: self.dtype(a=1, b=2, d=3))