Skip to content

Commit 8f33282

Browse files
committed
Resolving sonarqube dupllication errors
1 parent d54b5af commit 8f33282

File tree

1 file changed

+58
-38
lines changed

1 file changed

+58
-38
lines changed

tests/regression/regression_tests/fobt_regression_tests/test_scenario_8.py

Lines changed: 58 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -180,23 +180,28 @@ def test_scenario_8(page: Page) -> None:
180180

181181
# When I log my subject's latest unlogged FIT kit
182182
fit_kit = FitKitGeneration().get_fit_kit_for_subject_sql(nhs_no, False, False)
183-
sample_date = datetime.now()
184-
FitKitLogged().log_fit_kits(page, fit_kit, sample_date)
183+
FitKitLogged().log_fit_kits(page, fit_kit, datetime.now())
185184

186185
# Then my subject has been updated as follows:
187-
criteria = {
188-
"latest event status": "S43 Kit Returned and Logged (Initial Test)",
189-
}
190-
subject_assertion(nhs_no, criteria)
186+
187+
subject_assertion(
188+
nhs_no,
189+
criteria={
190+
"latest event status": "S43 Kit Returned and Logged (Initial Test)",
191+
},
192+
)
191193

192194
# When I read my subject's latest logged FIT kit as "ABNORMAL"
193195
FitKitLogged().read_latest_logged_kit(user_role, 2, fit_kit, "ABNORMAL")
194196

195197
# Then my subject has been updated as follows:
196-
criteria = {
197-
"latest event status": "A8 Abnormal",
198-
}
199-
subject_assertion(nhs_no, criteria)
198+
199+
subject_assertion(
200+
nhs_no,
201+
criteria={
202+
"latest event status": "A8 Abnormal",
203+
},
204+
)
200205
# When I view the subject
201206
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
202207

@@ -248,10 +253,12 @@ def test_scenario_8(page: Page) -> None:
248253
attendance.mark_as_attended_yesterday()
249254

250255
# Then my subject has been updated as follows:
251-
criteria = {
252-
"latest event status": "J10 Attended Colonoscopy Assessment Appointment",
253-
}
254-
subject_assertion(nhs_no, criteria)
256+
subject_assertion(
257+
nhs_no,
258+
criteria={
259+
"latest event status": "J10 Attended Colonoscopy Assessment Appointment",
260+
},
261+
)
255262

256263
# When I view the subject
257264
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -303,10 +310,12 @@ def test_scenario_8(page: Page) -> None:
303310
attendance.mark_diagnostic_test_as_dna()
304311

305312
# Then my subject has been updated as follows:
306-
criteria = {
307-
"latest event status": "A172 DNA Diagnostic Test",
308-
}
309-
subject_assertion(nhs_no, criteria)
313+
subject_assertion(
314+
nhs_no,
315+
criteria={
316+
"latest event status": "A172 DNA Diagnostic Test",
317+
},
318+
)
310319

311320
# When I switch users to BCSS "England" as user role "Hub Manager"
312321
UserTools.switch_user(page, "Hub Manager", "BCS01")
@@ -363,10 +372,12 @@ def test_scenario_8(page: Page) -> None:
363372
advance_fobt_episode.record_contact_close_episode_no_contact()
364373

365374
# Then my subject has been updated as follows:
366-
criteria = {
367-
"latest event status": "A397 Discharged from Screening Round - No Patient Contact",
368-
}
369-
subject_assertion(nhs_no, criteria)
375+
subject_assertion(
376+
nhs_no,
377+
criteria={
378+
"latest event status": "A397 Discharged from Screening Round - No Patient Contact",
379+
},
380+
)
370381

371382
# And there is a "A397" letter batch for my subject with the exact title "Discharge from screening round - no contact (letter to patient)"
372383
# When I process the open "A397" letter batch for my subject
@@ -463,10 +474,13 @@ def test_scenario_8(page: Page) -> None:
463474
ContactWithPatientPage(page).record_contact("Suitable for Radiological Test")
464475

465476
# Then my subject has been updated as follows:
466-
criteria = {
467-
"latest event status": "A100 Suitable for Radiological Test",
468-
}
469-
subject_assertion(nhs_no, criteria)
477+
478+
subject_assertion(
479+
nhs_no,
480+
criteria={
481+
"latest event status": "A100 Suitable for Radiological Test",
482+
},
483+
)
470484

471485
# When I view the advance episode options
472486
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -502,10 +516,12 @@ def test_scenario_8(page: Page) -> None:
502516
AttendDiagnosticTestPage(page).click_save_button()
503517

504518
# Then my subject has been updated as follows:
505-
criteria = {
506-
"latest event status": "A259 Attended Diagnostic Test",
507-
}
508-
subject_assertion(nhs_no, criteria)
519+
subject_assertion(
520+
nhs_no,
521+
criteria={
522+
"latest event status": "A259 Attended Diagnostic Test",
523+
},
524+
)
509525

510526
# When I view the subject
511527
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -775,10 +791,12 @@ def test_scenario_8(page: Page) -> None:
775791
AdvanceFOBTScreeningEpisodePage(page).click_invite_for_diagnostic_test_button()
776792

777793
# Then my subject has been updated as follows:
778-
criteria = {
779-
"latest event status": "A59 Invited for Diagnostic Test",
780-
}
781-
subject_assertion(nhs_no, criteria)
794+
subject_assertion(
795+
nhs_no,
796+
criteria={
797+
"latest event status": "A59 Invited for Diagnostic Test",
798+
},
799+
)
782800

783801
# When I select the advance episode option for "Attend Diagnostic Test"
784802
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)
@@ -791,10 +809,12 @@ def test_scenario_8(page: Page) -> None:
791809
AttendDiagnosticTestPage(page).click_save_button()
792810

793811
# Then my subject has been updated as follows:
794-
criteria = {
795-
"latest event status": "A259 Attended Diagnostic Test",
796-
}
797-
subject_assertion(nhs_no, criteria)
812+
subject_assertion(
813+
nhs_no,
814+
criteria={
815+
"latest event status": "A259 Attended Diagnostic Test",
816+
},
817+
)
798818

799819
# When I view the subject
800820
screening_subject_page_searcher.navigate_to_subject_summary_page(page, nhs_no)

0 commit comments

Comments
 (0)