From 4b207de4c859caeb1f9daa9d73ebb49006145c19 Mon Sep 17 00:00:00 2001 From: Dan Duffek Date: Wed, 1 May 2024 09:52:14 -0700 Subject: [PATCH] Simplify the Time Clearing Code (#1906) --- src/org/labkey/test/tests/SurveyTest.java | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/src/org/labkey/test/tests/SurveyTest.java b/src/org/labkey/test/tests/SurveyTest.java index 76d66c52c7..616890c7f7 100644 --- a/src/org/labkey/test/tests/SurveyTest.java +++ b/src/org/labkey/test/tests/SurveyTest.java @@ -29,7 +29,6 @@ import org.labkey.test.util.LogMethod; import org.labkey.test.util.PortalHelper; import org.labkey.test.util.WikiHelper; -import org.openqa.selenium.Keys; import org.openqa.selenium.WebElement; import java.io.File; @@ -152,15 +151,11 @@ public void testDateTimeWithExtConfig() setFormElement(Locator.name(DATETIME_DATE_FIELD_NAME), dateTimeFieldDateValue); assertEquals("'Date Time Field (date)' not set.", dateTimeFieldDateValue, getFormElement(Locator.name(DATETIME_DATE_FIELD_NAME))); - var dateTimeFieldTimeValue = "12:45"; final WebElement timeInput = Locator.name(DATETIME_TIME_FIELD_NAME).findElement(getDriver()); - int attempt = 0; - while (attempt++ < 5 && !"".equals(getFormElement(Locator.name(DATETIME_TIME_FIELD_NAME)))) - { - timeInput.clear(); - shortWait(); - } - assertEquals("'Date Time Field (time)' not cleared.", "", getFormElement(Locator.name(DATETIME_TIME_FIELD_NAME))); + timeInput.click(); + timeInput.clear(); + waitFor(()->timeInput.getText().isEmpty(), "'Date Time Field (time)' not cleared.",1_000); + var dateTimeFieldTimeValue = "12:45"; timeInput.sendKeys(dateTimeFieldTimeValue); assertEquals("'Date Time Field (time)' not set.", dateTimeFieldTimeValue, getFormElement(Locator.name(DATETIME_TIME_FIELD_NAME)));