From bb5cb7102d6426e3054e586e8923ae1ec300825e Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Thu, 12 Apr 2018 17:59:43 -0700 Subject: bunch of fixes (more needed) --- tests/test_backend.py | 40 +++++++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 15 deletions(-) (limited to 'tests') diff --git a/tests/test_backend.py b/tests/test_backend.py index fdb29c47..bc610d25 100644 --- a/tests/test_backend.py +++ b/tests/test_backend.py @@ -12,10 +12,9 @@ import tempfile ## Helpers ################################################################## def check_entity_fields(e): - for key in ('id', 'rev', 'previous', 'state', 'redirect_id', 'edit_id', - 'extra_json'): + for key in ('id', 'rev', 'redirect_id', 'edit_id'): assert key in e - for key in ('id', 'rev'): + for key in ('id',): assert e[key] is not None ## API Tests ################################################################ @@ -36,24 +35,28 @@ class FatcatTestCase(unittest.TestCase): assert obj['ok'] def test_works(self): + fatcat.sql.populate_db() # Invalid Id rv = self.app.get('/v0/work/_') assert rv.status_code == 404 - # Missing Id (TODO) - #rv = self.app.get('/v0/work/rzga5b9cd7efgh04iljk') - #assert rv.status == 404 - - # Valid Id (TODO) - #rv = self.app.get('/v0/work/r3zga5b9cd7ef8gh084714iljk') - #assert rv.status_code == 200 - + # Random rv = self.app.get('/v0/work/random') - obj = json.loads(rv.data.decode('utf-8')) - check_entity_fields(obj) - assert obj['title'] - assert obj['work_type'] == "journal-article" + rv = self.app.get(rv.location) + work = json.loads(rv.data.decode('utf-8')) + check_entity_fields(work) + print(work) + assert work['title'] + assert work['work_type'] + + # Valid Id (from random above) + rv = self.app.get('/v0/work/{}'.format(work['id'])) + assert rv.status_code == 200 + + # Missing Id + rv = self.app.get('/v0/work/r3zga5b9cd7ef8gh084714iljk') + assert rv.status_code == 404 def test_populate(self): fatcat.sql.populate_db() @@ -67,3 +70,10 @@ class FatcatTestCase(unittest.TestCase): for obj in raw: fatcat.sql.add_crossref(obj) + def test_hydrate_work(self): + fatcat.sql.populate_complex_db() + fatcat.sql.hydrate_work(1) + + def test_hydrate_release(self): + fatcat.sql.populate_complex_db() + fatcat.sql.hydrate_release(1) -- cgit v1.2.3