openstack
/
deb-python-warlock
Code Issues Proposed changes

Compare JSON strings as JSON instead of strings. 

Fixes #13.
This commit is contained in:
Jacopo Notarstefano 2015-04-13 10:13:54 +02:00
parent a398784748
commit 279384fe93
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
test/test_core.py
View File

@ -15,6 +15,8 @@
import copy import copy
import unittest import unittest
import json
import six import six
import warlock import warlock
@ -169,14 +171,17 @@ class TestCore(unittest.TestCase):
sweden = Country(name='Sweden', population=9379116) sweden = Country(name='Sweden', population=9379116)
sweden['name'] = 'Finland' sweden['name'] = 'Finland'
self.assertEqual( self.assertEqual(
sweden.patch, json.loads(sweden.patch),
'[{"path": "/name", "value": "Finland", "op": "replace"}]') json.loads(
'[{"path": "/name", "value": "Finland", "op": "replace"}]'))
def test_patch_drop_attribute(self): def test_patch_drop_attribute(self):
Country = warlock.model_factory(fixture) Country = warlock.model_factory(fixture)
sweden = Country(name='Sweden', population=9379116) sweden = Country(name='Sweden', population=9379116)
del sweden['name'] del sweden['name']
self.assertEqual(sweden.patch, '[{"path": "/name", "op": "remove"}]') self.assertEqual(
json.loads(sweden.patch),
json.loads('[{"path": "/name", "op": "remove"}]'))
def test_patch_reduce_operations(self): def test_patch_reduce_operations(self):
Country = warlock.model_factory(fixture) Country = warlock.model_factory(fixture)
@ -184,13 +189,15 @@ class TestCore(unittest.TestCase):
sweden['name'] = 'Finland' sweden['name'] = 'Finland'
self.assertEqual( self.assertEqual(
sweden.patch, json.loads(sweden.patch),
'[{"path": "/name", "value": "Finland", "op": "replace"}]') json.loads(
'[{"path": "/name", "value": "Finland", "op": "replace"}]'))
sweden['name'] = 'Norway' sweden['name'] = 'Norway'
self.assertEqual( self.assertEqual(
sweden.patch, json.loads(sweden.patch),
'[{"path": "/name", "value": "Norway", "op": "replace"}]') json.loads(
'[{"path": "/name", "value": "Norway", "op": "replace"}]'))
def test_patch_multiple_operations(self): def test_patch_multiple_operations(self):
Country = warlock.model_factory(fixture) Country = warlock.model_factory(fixture)
@ -198,7 +205,12 @@ class TestCore(unittest.TestCase):
sweden['name'] = 'Finland' sweden['name'] = 'Finland'
sweden['population'] = 5387000 sweden['population'] = 5387000
self.assertEqual(
sweden.patch, self.assertEqual(len(json.loads(sweden.patch)), 2)
patches = json.loads(
'[{"path": "/name", "value": "Finland", "op": "replace"}, ' '[{"path": "/name", "value": "Finland", "op": "replace"}, '
'{"path": "/population", "value": 5387000, "op": "replace"}]') '{"path": "/population", "value": 5387000, "op": "replace"}]')
for patch in json.loads(sweden.patch):
self.assertTrue(patch in patches)