Addressing PR comments

Author: adrianoaru-nhs

pages/datasets/investigation_dataset_page.py

@@ -386,7 +386,7 @@ def click_edit_dataset_button(self) -> None:
         """
         self.click(self.edit_dataset_button)
 
-    def assert_polyp_alogrithm_size(
+    def assert_polyp_algorithm_size(
         self, polyp_number: int, expected_value: Optional[str]
     ) -> None:
         """
@@ -418,7 +418,7 @@ def assert_polyp_alogrithm_size(
                 str(actual_value).strip() == str(expected_value).strip()
             ), f"Expected '{expected_value}', but got '{actual_value}'"
 
-    def assert_polyp_categrory(
+    def assert_polyp_category(
         self, polyp_number: int, expected_value: Optional[str]
     ) -> None:
         """

tests/regression/subject/episodes/datasets/investigation/endoscopy/polypcategories/test_diminutive_rectal_hyperplastic_polyp.py

@@ -207,22 +207,22 @@ def test_identify_diminutive_rectal_hyperplastic_polyp_from_histology_a(
 
     polyp_category_string = "Diminutive rectal hyperplastic polyp"
     InvestigationDatasetsPage(page).expect_text_to_be_visible("Abnormal")
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(1, "5")
-    InvestigationDatasetsPage(page).assert_polyp_categrory(1, polyp_category_string)
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(2, "1")
-    InvestigationDatasetsPage(page).assert_polyp_categrory(2, polyp_category_string)
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(3, "3")
-    InvestigationDatasetsPage(page).assert_polyp_categrory(3, polyp_category_string)
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(4, "5")
-    InvestigationDatasetsPage(page).assert_polyp_categrory(4, polyp_category_string)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, "5")
+    InvestigationDatasetsPage(page).assert_polyp_category(1, polyp_category_string)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(2, "1")
+    InvestigationDatasetsPage(page).assert_polyp_category(2, polyp_category_string)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(3, "3")
+    InvestigationDatasetsPage(page).assert_polyp_category(3, polyp_category_string)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(4, "5")
+    InvestigationDatasetsPage(page).assert_polyp_category(4, polyp_category_string)
 
     logging.info("Marking investigation dataset not complete")
     InvestigationDatasetsPage(page).click_edit_dataset_button()
     InvestigationDatasetsPage(page).check_dataset_incomplete_checkbox()
     InvestigationDatasetsPage(page).click_save_dataset_button()
     for polyp_number in range(1, 5):
-        InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(polyp_number, None)
-        InvestigationDatasetsPage(page).assert_polyp_categrory(polyp_number, None)
+        InvestigationDatasetsPage(page).assert_polyp_algorithm_size(polyp_number, None)
+        InvestigationDatasetsPage(page).assert_polyp_category(polyp_number, None)
 
     LogoutPage(page).log_out()
 
@@ -304,15 +304,15 @@ def test_identify_diminutive_rectal_hyperplastic_polyp_from_histology_b(
     )
 
     InvestigationDatasetsPage(page).expect_text_to_be_visible("Abnormal")
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(1, "2")
-    InvestigationDatasetsPage(page).assert_polyp_categrory(
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, "2")
+    InvestigationDatasetsPage(page).assert_polyp_category(
         1, "Diminutive rectal hyperplastic polyp"
     )
 
     logging.info("Marking investigation dataset not complete")
     InvestigationDatasetsPage(page).click_edit_dataset_button()
     InvestigationDatasetsPage(page).check_dataset_incomplete_checkbox()
     InvestigationDatasetsPage(page).click_save_dataset_button()
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(1, None)
-    InvestigationDatasetsPage(page).assert_polyp_categrory(1, None)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, None)
+    InvestigationDatasetsPage(page).assert_polyp_category(1, None)
     LogoutPage(page).log_out()

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

@@ -60,7 +60,6 @@
 }
 
 
-@pytest.mark.wip
 @pytest.mark.vpn_required
 @pytest.mark.regression
 @pytest.mark.investigation_dataset_tests

utils/datasets/investigation_datasets.py

@@ -282,8 +282,8 @@ def complete_and_assert_investigation(
         completion_information=completion_information,
     )
 
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(1, expected_size)
-    InvestigationDatasetsPage(page).assert_polyp_categrory(1, expected_category)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, expected_size)
+    InvestigationDatasetsPage(page).assert_polyp_category(1, expected_category)
 
     mark_dataset_not_complete_and_assert(page)
 
@@ -296,6 +296,6 @@ def mark_dataset_not_complete_and_assert(page: Page) -> None:
     InvestigationDatasetsPage(page).click_edit_dataset_button()
     InvestigationDatasetsPage(page).check_dataset_incomplete_checkbox()
     InvestigationDatasetsPage(page).click_save_dataset_button()
-    InvestigationDatasetsPage(page).assert_polyp_alogrithm_size(1, None)
-    InvestigationDatasetsPage(page).assert_polyp_categrory(1, None)
+    InvestigationDatasetsPage(page).assert_polyp_algorithm_size(1, None)
+    InvestigationDatasetsPage(page).assert_polyp_category(1, None)
     LogoutPage(page).log_out()