sartography
/
cr-connect-workflow
mirror of https://github.com/sartography/cr-connect-workflow.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add crosstalk test

This commit is contained in:
Kelly McDonald 2020-11-17 10:29:49 -05:00
parent e9979efb0d
commit 72ade3c367
2 changed files with 44 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crc/api/data_store.py
View File

@ -29,9 +29,9 @@ def study_data_get(study_id,key,default=None):
if key is None:
raise ApiError('invalid_key', 'Please provide a valid key')
dsb = DataStoreBase()
retval=dsb.get_data_common(study_id,None,'api_study_data_get',key,default)
json_value = json.dumps(retval, ensure_ascii=False, indent=2)
return json_value
retval = dsb.get_data_common(study_id,None,'api_study_data_get',key,default)
#json_value = json.dumps(retval, ensure_ascii=False, indent=2) # just return raw text
return retval
def study_multi_get(study_id):
"""Get all data_store values for a given study_id study"""
@ -93,8 +93,8 @@ def user_data_get(user_id,key,default=None):
'api_user_data_get',
key,default)
json_value = json.dumps(retval, ensure_ascii=False, indent=2)
return json_value
#json_value = json.dumps(retval, ensure_ascii=False, indent=2) # just return raw text
return retval
def user_multi_get(user_id):
"""Get all data values in the data_store for a userid"""

43
tests/test_datastore_api.py
View File

@ -21,7 +21,7 @@ class DataStoreTest(BaseTest):
"value": "Some Value"
}
def add_test_study(self):
def add_test_study_data(self):
study_data = DataStoreSchema().dump(self.TEST_STUDY_ITEM)
rv = self.app.post('/v1.0/datastore',
content_type="application/json",
@ -30,6 +30,19 @@ class DataStoreTest(BaseTest):
self.assert_success(rv)
return json.loads(rv.get_data(as_text=True))
def add_test_user_data(self):
study_data = DataStoreSchema().dump(self.TEST_STUDY_ITEM)
study_data['user_id'] = 'dhf8r'
del(study_data['study_id'])
study_data['value'] = 'User Value'
rv = self.app.post('/v1.0/datastore',
content_type="application/json",
headers=self.logged_in_headers(),
data=json.dumps(study_data))
self.assert_success(rv)
return json.loads(rv.get_data(as_text=True))
def test_get_study_data(self):
"""Generic test, but pretty detailed, in that the study should return a categorized list of workflows
@ -38,7 +51,7 @@ class DataStoreTest(BaseTest):
"""NOTE: The protocol builder is not enabled or mocked out. As the master workflow (which is empty),
and the test workflow do not need it, and it is disabled in the configuration."""
self.load_example_data()
new_study = self.add_test_study()
new_study = self.add_test_study_data()
new_study = session.query(DataStoreModel).filter_by(id=new_study["id"]).first()
api_response = self.app.get('/v1.0/datastore/%i' % new_study.id,
@ -55,7 +68,7 @@ class DataStoreTest(BaseTest):
def test_update_study(self):
self.load_example_data()
new_study = self.add_test_study()
new_study = self.add_test_study_data()
new_study = session.query(DataStoreModel).filter_by(id=new_study["id"]).first()
new_study.value = 'MyNewValue'
api_response = self.app.put('/v1.0/datastore/%i' % new_study.id,
@ -76,7 +89,7 @@ class DataStoreTest(BaseTest):
def test_delete_study(self):
self.load_example_data()
new_study = self.add_test_study()
new_study = self.add_test_study_data()
oldid = new_study['id']
new_study = session.query(DataStoreModel).filter_by(id=new_study["id"]).first()
rv = self.app.delete('/v1.0/datastore/%i' % new_study.id, headers=self.logged_in_headers())
@ -84,3 +97,25 @@ class DataStoreTest(BaseTest):
studyreponse = session.query(DataStoreModel).filter_by(id=oldid).first()
self.assertEqual(studyreponse,None)
def test_data_crosstalk(self):
"""Test to make sure that data saved for user or study is not acessible from the other method"""
self.load_example_data()
new_study = self.add_test_study_data()
new_user = self.add_test_user_data()
api_response = self.app.get('/v1.0/datastore/user/get?key=%s&user_id=%s' % (new_user['key'],
new_user['user_id']),
headers=self.logged_in_headers(), content_type="application/json")
self.assert_success(api_response)
d = api_response.get_data(as_text=True)
self.assertEqual(eval(d),'User Value')
api_response = self.app.get('/v1.0/datastore/study/get?key=%s&study_id=%d' %(new_study['key'],
new_study['study_id']),
headers=self.logged_in_headers(), content_type="application/json")
self.assert_success(api_response)
d = api_response.get_data(as_text=True)
self.assertEqual(eval(d),'Some Value')