Skip to content

Commit 4584a4b

Browse files
committed
fix test utility method
1 parent b35ca85 commit 4584a4b

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

tests/test_item.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def test_to_from_dict(self):
1616
with open(m) as f:
1717
item_dict = json.load(f)['features'][0]
1818

19-
self.assertTrue(test_to_from_dict(Item, item_dict))
19+
test_to_from_dict(self, Item, item_dict)
2020
item = Item.from_dict(item_dict)
2121
self.assertEqual(item.get_self_href(), 'http://cool-sat.com/catalog/CS3-20160503_132130_04/CS3-20160503_132130_04.json')
2222

tests/utils.py

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import os
22
import json
33
from datetime import datetime
4-
from copy import copy
4+
from copy import copy, deepcopy
55
from dateutil.parser import parse
66
import jsonschema
77
from jsonschema.validators import RefResolver
@@ -164,9 +164,8 @@ def validate_dict(self, d, obj_type):
164164
print('Validation error in {}'.format(obj_type))
165165
raise e
166166

167-
def test_to_from_dict(stac_object_class, d):
168-
def _parse_times(dd):
169-
a_dict = copy(dd)
167+
def test_to_from_dict(test_class, stac_object_class, d):
168+
def _parse_times(a_dict):
170169
for k, v in a_dict.items():
171170
if isinstance(v, dict):
172171
_parse_times(v)
@@ -178,10 +177,10 @@ def _parse_times(dd):
178177
if k == 'datetime':
179178
if not isinstance(v, datetime):
180179
a_dict[k] = parse(v)
181-
182-
return a_dict
183-
184-
d1 = _parse_times(d)
185-
d2 = _parse_times(stac_object_class.from_dict(d).to_dict())
186-
187-
return d1 == d2
180+
a_dict[k] = a_dict[k].replace(microsecond=0)
181+
182+
d1 = deepcopy(d)
183+
d2 = stac_object_class.from_dict(d).to_dict()
184+
_parse_times(d1)
185+
_parse_times(d2)
186+
test_class.assertDictEqual(d1, d2)

0 commit comments

Comments
 (0)