Merge pull request #11938 from hzi-braunschweig/qa-auto/SORQA-970

SORQA-970 Stabilized "Test Hide "buried" within Person present condit…
SORMAS-Foundation · May 8, 2023 · 244b3eb · 244b3eb
2 parents 9a267d8 + 5b2994f
commit 244b3eb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/...sts/src/test/java/org/sormas/e2etests/steps/web/application/cases/CaseDirectorySteps.java b/...sts/src/test/java/org/sormas/e2etests/steps/web/application/cases/CaseDirectorySteps.java
@@ -23,7 +23,6 @@
 import static org.sormas.e2etests.pages.application.cases.CreateNewCasePage.DATE_OF_REPORT_INPUT;
 import static org.sormas.e2etests.pages.application.cases.CreateNewCasePage.SAVE_BUTTON;
 import static org.sormas.e2etests.pages.application.cases.CreateNewCasePage.UUID_EXTERNAL_ID_EXTERNAL_TOKEN_LIKE_INPUT;
-import static org.sormas.e2etests.pages.application.cases.EditCasePage.ACTION_CANCEL;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.ACTION_CLOSE;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.ACTION_CONFIRM;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.ARCHIVE_RELATED_CONTACTS_CHECKBOX;
@@ -89,7 +88,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
-
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.By;
@@ -1266,7 +1264,7 @@ public CaseDirectorySteps(
         "I check if csv file for detailed case is imported successfully",
         () -> {
           webDriverHelpers.isElementVisibleWithTimeout(IMPORT_SUCCESSFUL_FACILITY_IMPORT_CSV, 10);
-          webDriverHelpers.clickOnWebElementBySelector(ACTION_CANCEL);
+          webDriverHelpers.clickOnWebElementBySelector(ACTION_CLOSE);
           webDriverHelpers.clickOnWebElementBySelector(CLOSE_DETAILED_EXPORT_POPUP);
         });
 
@@ -1518,8 +1516,7 @@ public static void writeCSVFromMapDetailedCase(
       int lRandom = ThreadLocalRandom.current().nextInt(8999999, 9999999 + 1);
       detailedCase.computeIfPresent("id", (k, v) -> v = String.valueOf(lRandom));
       detailedCase.computeIfPresent("uuid", (k, v) -> v = caseUUIDFromCSV);
-      detailedCase.computeIfPresent(
-          "epidNumber", (k, v) -> v = epidNumber);
+      detailedCase.computeIfPresent("epidNumber", (k, v) -> v = epidNumber);
       detailedCase.computeIfPresent("personUuid", (k, v) -> v = personUUID);
       detailedCase.computeIfPresent("personFirstName", (k, v) -> v = firstName);
       detailedCase.computeIfPresent("personLastName", (k, v) -> v = lastName);

diff --git a/...c/test/java/org/sormas/e2etests/steps/web/application/contacts/ContactDirectorySteps.java b/...c/test/java/org/sormas/e2etests/steps/web/application/contacts/ContactDirectorySteps.java
@@ -36,7 +36,6 @@
 import static org.sormas.e2etests.pages.application.cases.CaseDirectoryPage.SHARE_OPTION_BULK_ACTION_COMBOBOX;
 import static org.sormas.e2etests.pages.application.cases.CaseDirectoryPage.SHOW_MORE_LESS_FILTERS;
 import static org.sormas.e2etests.pages.application.cases.CaseDirectoryPage.getMergeDuplicatesButtonById;
-import static org.sormas.e2etests.pages.application.cases.EditCasePage.ACTION_CANCEL;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.ACTION_CLOSE;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.CREATE_NEW_CASE_CHECKBOX;
 import static org.sormas.e2etests.pages.application.cases.EditCasePage.DISEASE_COMBOBOX;
@@ -189,7 +188,6 @@
 import java.util.concurrent.ThreadLocalRandom;
 import java.util.concurrent.TimeUnit;
 import javax.inject.Inject;
-
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import org.openqa.selenium.By;
@@ -1233,7 +1231,7 @@ public ContactDirectorySteps(
         "I check if csv file for detailed contact is imported successfully",
         () -> {
           webDriverHelpers.isElementVisibleWithTimeout(IMPORT_SUCCESSFUL_FACILITY_IMPORT_CSV, 10);
-          webDriverHelpers.clickOnWebElementBySelector(ACTION_CANCEL);
+          webDriverHelpers.clickOnWebElementBySelector(ACTION_CLOSE);
           webDriverHelpers.clickOnWebElementBySelector(CLOSE_DETAILED_EXPORT_POPUP);
         });