diff --git a/test/test_survey_publisher_old_db_2022.py b/test/test_survey_publisher_old_db_2022.py index 39259ab6dcb8f4ef543a8e49ce7bc83a37ba4d6e..0cbefc76f32a8d9e45b949174597a498dca849da 100644 --- a/test/test_survey_publisher_old_db_2022.py +++ b/test/test_survey_publisher_old_db_2022.py @@ -155,7 +155,7 @@ def test_publisher(app_with_survey_db, mocker): if question == StaffQuestion.PERMANENT_FTE: return [ - ('nren1', '40'), + ('nren1', '60'), ('nren2', 'abc'), ('nren3', '30'), ] @@ -228,7 +228,7 @@ def test_publisher(app_with_survey_db, mocker): funding_sources = db.session.scalars( select(presentation_models.FundingSource).order_by(presentation_models.FundingSource.nren_id.asc()) ).all() - assert len(funding_sources) == 3 + assert len(funding_sources) == 2 assert funding_sources[0].nren.name.lower() == 'nren1' assert funding_sources[0].client_institutions == 10 assert funding_sources[0].european_funding == 50 @@ -239,34 +239,17 @@ def test_publisher(app_with_survey_db, mocker): assert funding_sources[1].european_funding == 20 assert funding_sources[1].other == 0 - assert funding_sources[2].nren.name.lower() == 'nren3' - assert funding_sources[2].client_institutions == 30 - assert funding_sources[2].european_funding == 30 - assert funding_sources[2].other == 30 - staff_data = db.session.scalars( select(presentation_models.NrenStaff).order_by(presentation_models.NrenStaff.nren_id.asc()) ).all() - assert len(staff_data) == 3 + assert len(staff_data) == 1 assert staff_data[0].nren.name.lower() == 'nren1' assert staff_data[0].non_technical_fte == 10 assert staff_data[0].technical_fte == 50 - assert staff_data[0].permanent_fte == 40 + assert staff_data[0].permanent_fte == 60 assert staff_data[0].subcontracted_fte == 0 - assert staff_data[1].nren.name.lower() == 'nren2' - assert staff_data[1].non_technical_fte == 80 - assert staff_data[1].technical_fte == 20 - assert staff_data[1].permanent_fte == 0 - assert staff_data[1].subcontracted_fte == 0 - - assert staff_data[2].nren.name.lower() == 'nren3' - assert staff_data[2].non_technical_fte == 30 - assert staff_data[2].technical_fte == 30 - assert staff_data[2].permanent_fte == 30 - assert staff_data[2].subcontracted_fte == 0 - _org_data = db.session.scalars( select(presentation_models.ParentOrganization).order_by( presentation_models.ParentOrganization.nren_id.asc())