Skip to content

Commit 42ede82

Browse files
adrianoaru-nhsadrianoaru-nhs
committed
Adding remaining sceanrios and adding more assertions.
1 parent b7e6fc4 commit 42ede82

File tree

7 files changed

+768
-24
lines changed

7 files changed

+768
-24
lines changed

‎pages/datasets/investigation_dataset_page.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -807,3 +807,20 @@ class ReasonPathologyLostOptions(StrEnum):
807807

808808
LOST_IN_TRANSIT = "200561~~204337"
809809
DESTROYED_DURING_PROCESSING = "200562~~204337"
810+
811+
812+
class PolypInterventionSuccessOptions(StrEnum):
813+
"""Enum for polyp intervention success options"""
814+
815+
SUCCESSFUL = "17200"
816+
UNSUCCESSFUL = "17201"
817+
818+
819+
class PolypReasonLeftInSituOptions(StrEnum):
820+
"""Enum for reasons a polyp was left in situ"""
821+
822+
POLYP_TYPE = "200556"
823+
REQUIRES_ANOTHER_PROCEDURE = "200557"
824+
REQUIRES_SURGICAL_RESECTION = "200558"
825+
CANNOT_FIND_POLYP_ON_WITHDRAWAL = "200559"
826+
CLINICAL_DECISION_NOT_TO_EXCISE = "203082"

‎tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_advanced_colorectal_polyp.py‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
}
6161

6262
category_as_string = "Advanced colorectal polyp"
63+
abnormal_string = "Abnormal"
6364

6465

6566
@pytest.fixture(autouse=True)
@@ -124,6 +125,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_a(page: Page) -> None
124125
drug_information=drug_information,
125126
endoscopy_information=endoscopy_information,
126127
failure_information=failure_information,
128+
expected_dataset_result=abnormal_string,
127129
expected_category=category_as_string,
128130
expected_size="9",
129131
polyp_information=polyp_1_information,
@@ -172,6 +174,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_b(page: Page) -> None
172174
drug_information=drug_information,
173175
endoscopy_information=endoscopy_information,
174176
failure_information=failure_information,
177+
expected_dataset_result=abnormal_string,
175178
expected_category=category_as_string,
176179
expected_size="8",
177180
polyp_information=polyp_1_information,
@@ -214,6 +217,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_c(page: Page) -> None
214217
drug_information=drug_information,
215218
endoscopy_information=endoscopy_information,
216219
failure_information=failure_information,
220+
expected_dataset_result=abnormal_string,
217221
expected_category=category_as_string,
218222
expected_size="10",
219223
polyp_information=polyp_1_information,
@@ -262,6 +266,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_d(page: Page) -> None
262266
drug_information=drug_information,
263267
endoscopy_information=endoscopy_information,
264268
failure_information=failure_information,
269+
expected_dataset_result=abnormal_string,
265270
expected_category=category_as_string,
266271
expected_size="8",
267272
polyp_information=polyp_1_information,
@@ -315,6 +320,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_e(page: Page) -> None
315320
drug_information=drug_information,
316321
endoscopy_information=endoscopy_information,
317322
failure_information=failure_information,
323+
expected_dataset_result=abnormal_string,
318324
expected_category=category_as_string,
319325
expected_size="11",
320326
polyp_information=polyp_1_information,
@@ -365,6 +371,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_f(page: Page) -> None
365371
drug_information=drug_information,
366372
endoscopy_information=endoscopy_information,
367373
failure_information=failure_information,
374+
expected_dataset_result=abnormal_string,
368375
expected_category=category_as_string,
369376
expected_size="10",
370377
polyp_information=polyp_1_information,
@@ -413,6 +420,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_g(page: Page) -> None
413420
drug_information=drug_information,
414421
endoscopy_information=endoscopy_information,
415422
failure_information=failure_information,
423+
expected_dataset_result=abnormal_string,
416424
expected_category=category_as_string,
417425
expected_size="10",
418426
polyp_information=polyp_1_information,
@@ -463,6 +471,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_h(page: Page) -> None
463471
drug_information=drug_information,
464472
endoscopy_information=endoscopy_information,
465473
failure_information=failure_information,
474+
expected_dataset_result=abnormal_string,
466475
expected_category=category_as_string,
467476
expected_size="12",
468477
polyp_information=polyp_1_information,
@@ -516,6 +525,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_i(page: Page) -> None
516525
drug_information=drug_information,
517526
endoscopy_information=endoscopy_information,
518527
failure_information=failure_information,
528+
expected_dataset_result=abnormal_string,
519529
expected_category=category_as_string,
520530
expected_size="11",
521531
polyp_information=polyp_1_information,
@@ -561,6 +571,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_j(page: Page) -> None
561571
drug_information=drug_information,
562572
endoscopy_information=endoscopy_information,
563573
failure_information=failure_information,
574+
expected_dataset_result=abnormal_string,
564575
expected_category=category_as_string,
565576
expected_size="13",
566577
polyp_information=polyp_1_information,
@@ -610,6 +621,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_k(page: Page) -> None
610621
drug_information=drug_information,
611622
endoscopy_information=endoscopy_information,
612623
failure_information=failure_information,
624+
expected_dataset_result=abnormal_string,
613625
expected_category=category_as_string,
614626
expected_size="7",
615627
polyp_information=polyp_1_information,
@@ -660,6 +672,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_l(page: Page) -> None
660672
drug_information=drug_information,
661673
endoscopy_information=endoscopy_information,
662674
failure_information=failure_information,
675+
expected_dataset_result=abnormal_string,
663676
expected_category=category_as_string,
664677
expected_size="6",
665678
polyp_information=polyp_1_information,
@@ -710,6 +723,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_m(page: Page) -> None
710723
drug_information=drug_information,
711724
endoscopy_information=endoscopy_information,
712725
failure_information=failure_information,
726+
expected_dataset_result=abnormal_string,
713727
expected_category=category_as_string,
714728
expected_size="5",
715729
polyp_information=polyp_1_information,
@@ -762,6 +776,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_n(page: Page) -> None
762776
drug_information=drug_information,
763777
endoscopy_information=endoscopy_information,
764778
failure_information=failure_information,
779+
expected_dataset_result=abnormal_string,
765780
expected_category=category_as_string,
766781
expected_size="4",
767782
polyp_information=polyp_1_information,
@@ -815,6 +830,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_o(page: Page) -> None
815830
drug_information=drug_information,
816831
endoscopy_information=endoscopy_information,
817832
failure_information=failure_information,
833+
expected_dataset_result=abnormal_string,
818834
expected_category=category_as_string,
819835
expected_size="3",
820836
polyp_information=polyp_1_information,
@@ -866,6 +882,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_p(page: Page) -> None
866882
drug_information=drug_information,
867883
endoscopy_information=endoscopy_information,
868884
failure_information=failure_information,
885+
expected_dataset_result=abnormal_string,
869886
expected_category=category_as_string,
870887
expected_size="2",
871888
polyp_information=polyp_1_information,
@@ -916,6 +933,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_q(page: Page) -> None
916933
drug_information=drug_information,
917934
endoscopy_information=endoscopy_information,
918935
failure_information=failure_information,
936+
expected_dataset_result=abnormal_string,
919937
expected_category=category_as_string,
920938
expected_size="20",
921939
polyp_information=polyp_1_information,
@@ -998,6 +1016,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_r(page: Page) -> None
9981016
drug_information=drug_information,
9991017
endoscopy_information=endoscopy_information,
10001018
failure_information=failure_information,
1019+
expected_dataset_result=abnormal_string,
10011020
expected_category=category_as_string,
10021021
expected_size="6",
10031022
polyp_information=polyp_1_information,
@@ -1046,6 +1065,7 @@ def test_identify_advanced_colorectal_polyp_from_histology_s(page: Page) -> None
10461065
drug_information=drug_information,
10471066
endoscopy_information=endoscopy_information,
10481067
failure_information=failure_information,
1068+
expected_dataset_result=abnormal_string,
10491069
expected_category=category_as_string,
10501070
expected_size="32",
10511071
polyp_information=polyp_1_information,

‎tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_lnpcp.py‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ def test_identify_lnpcp_from_histology_a(
122122
drug_information=drug_information,
123123
endoscopy_information=endoscopy_information,
124124
failure_information=failure_information,
125+
expected_dataset_result=lnpcp_string,
125126
expected_category=lnpcp_string,
126127
expected_size="20",
127128
polyp_information=polyp_1_information,
@@ -192,6 +193,7 @@ def test_identify_lnpcp_from_histology_b(
192193
drug_information=drug_information,
193194
endoscopy_information=endoscopy_information,
194195
failure_information=failure_information,
196+
expected_dataset_result=lnpcp_string,
195197
expected_category=lnpcp_string,
196198
expected_size="21",
197199
polyp_information=polyp_1_information,
@@ -262,6 +264,7 @@ def test_identify_lnpcp_from_histology_c(
262264
drug_information=drug_information,
263265
endoscopy_information=endoscopy_information,
264266
failure_information=failure_information,
267+
expected_dataset_result=lnpcp_string,
265268
expected_category=lnpcp_string,
266269
expected_size="22",
267270
polyp_information=polyp_1_information,
@@ -333,6 +336,7 @@ def test_identify_lnpcp_from_histology_d(
333336
drug_information=drug_information,
334337
endoscopy_information=endoscopy_information,
335338
failure_information=failure_information,
339+
expected_dataset_result=lnpcp_string,
336340
expected_category=lnpcp_string,
337341
expected_size="20",
338342
polyp_information=polyp_1_information,
@@ -406,6 +410,7 @@ def test_identify_lnpcp_from_histology_e(
406410
drug_information=drug_information,
407411
endoscopy_information=endoscopy_information,
408412
failure_information=failure_information,
413+
expected_dataset_result=lnpcp_string,
409414
expected_category=lnpcp_string,
410415
expected_size="20",
411416
polyp_information=polyp_1_information,
@@ -482,6 +487,7 @@ def test_identify_lnpcp_from_histology_f(
482487
drug_information=drug_information,
483488
endoscopy_information=endoscopy_information,
484489
failure_information=failure_information,
490+
expected_dataset_result=lnpcp_string,
485491
expected_category=lnpcp_string,
486492
expected_size="21",
487493
polyp_information=polyp_1_information,
@@ -556,6 +562,7 @@ def test_identify_lnpcp_from_histology_g(
556562
drug_information=drug_information,
557563
endoscopy_information=endoscopy_information,
558564
failure_information=failure_information,
565+
expected_dataset_result=lnpcp_string,
559566
expected_category=lnpcp_string,
560567
expected_size="20",
561568
polyp_information=polyp_1_information,
@@ -631,6 +638,7 @@ def test_identify_lnpcp_from_histology_h(
631638
drug_information=drug_information,
632639
endoscopy_information=endoscopy_information,
633640
failure_information=failure_information,
641+
expected_dataset_result=lnpcp_string,
634642
expected_category=lnpcp_string,
635643
expected_size="22",
636644
polyp_information=polyp_1_information,
@@ -706,6 +714,7 @@ def test_identify_lnpcp_from_histology_i(
706714
drug_information=drug_information,
707715
endoscopy_information=endoscopy_information,
708716
failure_information=failure_information,
717+
expected_dataset_result=lnpcp_string,
709718
expected_category=lnpcp_string,
710719
expected_size="21",
711720
polyp_information=polyp_1_information,
@@ -782,6 +791,7 @@ def test_identify_lnpcp_from_histology_r(
782791
drug_information=drug_information,
783792
endoscopy_information=endoscopy_information,
784793
failure_information=failure_information,
794+
expected_dataset_result=lnpcp_string,
785795
expected_category=lnpcp_string,
786796
expected_size="20",
787797
polyp_information=polyp_1_information,
@@ -880,6 +890,7 @@ def test_identify_lnpcp_from_histology_s(
880890
drug_information=drug_information,
881891
endoscopy_information=endoscopy_information,
882892
failure_information=failure_information,
893+
expected_dataset_result="Abnormal",
883894
expected_category=lnpcp_string,
884895
expected_size="20",
885896
polyp_information=polyp_1_information,

0 commit comments

Comments
 (0)