diff --git a/tests/acceptance/test_embedded_study.py b/tests/acceptance/test_embedded_study.py index 1dc500bf9..8c6549897 100644 --- a/tests/acceptance/test_embedded_study.py +++ b/tests/acceptance/test_embedded_study.py @@ -10,15 +10,18 @@ parameterised_dataset_definition, trivial_dataset_definition, ) -from tests.lib.tpp_schema import Patient +from tests.lib.tpp_schema import AllowedPatientsWithTypeOneDissent, Patient @pytest.mark.parametrize("extension", list(FILE_FORMATS.keys())) def test_generate_dataset(study, mssql_database, extension): mssql_database.setup( Patient(Patient_ID=1, DateOfBirth=datetime(1934, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=1), Patient(Patient_ID=2, DateOfBirth=datetime(1943, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=2), Patient(Patient_ID=3, DateOfBirth=datetime(1999, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=3), ) study.setup_from_string(trivial_dataset_definition) @@ -36,8 +39,11 @@ def test_generate_dataset(study, mssql_database, extension): def test_parameterised_dataset_definition(study, mssql_database): mssql_database.setup( Patient(Patient_ID=1, DateOfBirth=datetime(1934, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=1), Patient(Patient_ID=2, DateOfBirth=datetime(1943, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=2), Patient(Patient_ID=3, DateOfBirth=datetime(1999, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=3), ) study.setup_from_string(parameterised_dataset_definition) diff --git a/tests/docker/test_cli.py b/tests/docker/test_cli.py index 50dfa0e7d..203f0b548 100644 --- a/tests/docker/test_cli.py +++ b/tests/docker/test_cli.py @@ -5,11 +5,14 @@ from tests.lib import fixtures from tests.lib.docker import ContainerError -from tests.lib.tpp_schema import Patient +from tests.lib.tpp_schema import AllowedPatientsWithTypeOneDissent, Patient def test_generate_dataset_in_container(study, mssql_database): - mssql_database.setup(Patient(Patient_ID=1, DateOfBirth=datetime(1943, 5, 5))) + mssql_database.setup( + Patient(Patient_ID=1, DateOfBirth=datetime(1943, 5, 5)), + AllowedPatientsWithTypeOneDissent(Patient_ID=1), + ) study.setup_from_string(fixtures.trivial_dataset_definition) study.generate_in_docker(mssql_database, "ehrql.backends.tpp.TPPBackend")