Skip to content

Fix #174: verify logic of Entity.__repr__ #252

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
tseaver wants to merge 4 commits into from
Closed

Fix #174: verify logic of Entity.__repr__ #252

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7c55a04
Avoid interior use of 'key()' setter-getter.
tseaver Oct 17, 2014
c873770
Add tests for logic in Entity.__repr__.
tseaver Oct 17, 2014
bdfd144
Add docstring to exception.
tseaver Oct 17, 2014
1f4c7f5
Remove inaccurate comment.
tseaver Oct 17, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add tests for logic in Entity.__repr__. 
Fixes #179.
  • Loading branch information
@tseaver
tseaver committed Oct 17, 2014
commit c873770645f905e981f8af531b2d01ed8adf82bb
22 changes: 18 additions & 4 deletions gcloud/datastore/test_entity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ def test_from_protobuf(self):
def test_reload_no_key(self):
from gcloud.datastore.entity import NoKey

dataset = _Dataset()
entity = self._makeOne(None, None)
entity['foo'] = 'Foo'
self.assertRaises(NoKey, entity.reload)
Expand Down Expand Up @@ -116,7 +115,6 @@ def test_reload_hit(self):
def test_save_no_key(self):
from gcloud.datastore.entity import NoKey

dataset = _Dataset()
entity = self._makeOne(None, None)
entity['foo'] = 'Foo'
self.assertRaises(NoKey, entity.save)
Expand Down Expand Up @@ -186,7 +184,6 @@ def test_save_w_returned_key(self):
def test_delete_no_key(self):
from gcloud.datastore.entity import NoKey

dataset = _Dataset()
entity = self._makeOne(None, None)
entity['foo'] = 'Foo'
self.assertRaises(NoKey, entity.delete)
Expand All @@ -201,8 +198,23 @@ def test_delete(self):
self.assertTrue(entity.delete() is None)
self.assertEqual(connection._deleted, (_DATASET_ID, 'KEY'))

def test___repr___no_key_empty(self):
entity = self._makeOne(None, None)
self.assertEqual(repr(entity), '<Entity {}>')

def test___repr___w_key_non_empty(self):
connection = _Connection()
dataset = _Dataset(connection)
key = _Key(dataset)
key.path('/bar/baz')
entity = self._makeOne()
entity.key(key)
entity['foo'] = 'Foo'
self.assertEqual(repr(entity), "<Entity/bar/baz {'foo': 'Foo'}>")


class _Key(object):
_MARKER = object()
_key = 'KEY'
_partial = False
_path = None
Expand All @@ -219,7 +231,9 @@ def to_protobuf(self):
def is_partial(self):
return self._partial

def path(self, path):
def path(self, path=_MARKER):
if path is self._MARKER:
return self._path
self._path = path


Expand Down