From 7912f9628cf7eebfbca3a01439fdf70c8d88a052 Mon Sep 17 00:00:00 2001 From: Matthew Richards Date: Mon, 22 Feb 2021 14:25:32 +0000 Subject: [PATCH] #119: Fix tests for entities referencing foreign keys --- test/db/conftest.py | 12 ++++++------ test/db/test_entity_helper.py | 33 ++++++++++++++++++--------------- 2 files changed, 24 insertions(+), 21 deletions(-) diff --git a/test/db/conftest.py b/test/db/conftest.py index 100f5d04..b7815ed8 100644 --- a/test/db/conftest.py +++ b/test/db/conftest.py @@ -42,8 +42,8 @@ def create_investigation_db_data(num_entities=1): year=2020, month=1, day=8, hour=1, minute=1, second=1, ) investigation.visitId = str(uuid.uuid1()) - investigation.facility = 1 - investigation.type = 1 + investigation.facilityID = 1 + investigation.typeID = 1 set_meta_attributes(investigation) @@ -86,7 +86,7 @@ def isis_specific_endpoint_data_db(): facility_cycle.endDate = datetime( year=2020, month=2, day=1, hour=1, minute=1, second=1, ) - facility_cycle.facility = 1 + facility_cycle.facilityID = 1 set_meta_attributes(facility_cycle) insert_row_into_table(FACILITYCYCLE, facility_cycle) @@ -94,13 +94,13 @@ def isis_specific_endpoint_data_db(): instrument = INSTRUMENT() instrument.name = "Test Instrument for DataGateway API Endpoint Testing (DB)" - instrument.facility = 1 + instrument.facilityID = 1 set_meta_attributes(instrument) insert_row_into_table(INSTRUMENT, instrument) investigation_instrument = INVESTIGATIONINSTRUMENT() - investigation_instrument.investigation = investigation.id - investigation_instrument.instrument = instrument.id + investigation_instrument.investigationID = investigation.id + investigation_instrument.instrumentID = instrument.id set_meta_attributes(investigation_instrument) insert_row_into_table(INVESTIGATIONINSTRUMENT, investigation_instrument) diff --git a/test/db/test_entity_helper.py b/test/db/test_entity_helper.py index b71cf96d..6818b86d 100644 --- a/test/db/test_entity_helper.py +++ b/test/db/test_entity_helper.py @@ -33,12 +33,12 @@ def datafile_entity(dataset_entity): datafile.fileSize = 64 datafile.datafileModTime = Constants.TEST_MOD_CREATE_DATETIME datafile.datafileCreateTime = Constants.TEST_MOD_CREATE_DATETIME - datafile.dataset = 1 + datafile.datasetID = 1 datafile.doi = "test doi" datafile.description = "test description" datafile.createId = "test create id" datafile.modId = "test mod id" - datafile.datafileFormat = 1 + datafile.datafileFormatID = 1 return datafile @@ -54,12 +54,12 @@ def test_valid_to_dict(self, datafile_entity): "fileSize": 64, "datafileModTime": str(Constants.TEST_MOD_CREATE_DATETIME), "datafileCreateTime": str(Constants.TEST_MOD_CREATE_DATETIME), - "dataset": 1, + "datasetID": 1, "doi": "test doi", "description": "test description", "createId": "test create id", "modId": "test mod id", - "datafileFormat": 1, + "datafileFormatID": 1, "createTime": str(Constants.TEST_MOD_CREATE_DATETIME), } @@ -84,15 +84,16 @@ def test_valid_to_dict(self, datafile_entity): "description": "test description", "createId": "test create id", "modId": "test mod id", - "datafileFormat": 1, + "datafileFormatID": 1, "createTime": str(Constants.TEST_MOD_CREATE_DATETIME), + "datasetID": 1, "dataset": { "id": None, "createTime": None, "modTime": None, "createId": None, "modId": None, - "investigation": None, + "investigationID": None, "complete": None, "description": None, "doi": None, @@ -100,8 +101,8 @@ def test_valid_to_dict(self, datafile_entity): "location": None, "name": None, "startDate": None, - "sample": None, - "type": None, + "sampleID": None, + "typeID": None, }, }, "dataset", @@ -121,8 +122,9 @@ def test_valid_to_dict(self, datafile_entity): "description": "test description", "createId": "test create id", "modId": "test mod id", - "datafileFormat": 1, + "datafileFormatID": 1, "createTime": str(Constants.TEST_MOD_CREATE_DATETIME), + "datasetID": 1, "dataset": { "id": None, "createTime": None, @@ -136,8 +138,9 @@ def test_valid_to_dict(self, datafile_entity): "location": None, "name": None, "startDate": None, - "sample": None, - "type": None, + "sampleID": None, + "typeID": None, + "investigationID": None, "investigation": { "id": None, "createId": None, @@ -152,8 +155,8 @@ def test_valid_to_dict(self, datafile_entity): "summary": None, "title": None, "visitId": None, - "facility": None, - "type": None, + "facilityID": None, + "typeID": None, }, }, }, @@ -181,12 +184,12 @@ def test_valid_update_from_dict(self, datafile_entity): "fileSize": 64, "datafileModTime": str(Constants.TEST_MOD_CREATE_DATETIME), "datafileCreateTime": str(Constants.TEST_MOD_CREATE_DATETIME), - "dataset": 1, + "datasetID": 1, "doi": "test doi", "description": "test description", "createId": "test create id", "modId": "test mod id", - "datafileFormat": 1, + "datafileFormatID": 1, "createTime": str(Constants.TEST_MOD_CREATE_DATETIME), }