Skip to content

Commit

Permalink
Merge 24.12 to develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@labkey-teamcity
labkey-teamcity committed Dec 17, 2024
2 parents 28b21a3 + e739e6d commit 632c744
Show file tree
Hide file tree
Showing 3 changed files with 98 additions and 162 deletions.
154 changes: 7 additions & 147 deletions src/org/labkey/test/pages/admin/FolderFormatsPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@
import org.labkey.test.WebDriverWrapper;
import org.labkey.test.WebTestHelper;
import org.labkey.test.pages.core.admin.BaseSettingsPage;
import org.labkey.test.pages.core.admin.BaseSettingsPage.DATE_FORMAT;
import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement;

public class FolderFormatsPage extends FolderManagementPage
public class FolderFormatsPage extends BaseSettingsPage
{

public FolderFormatsPage(WebDriver driver)
Expand Down Expand Up @@ -50,42 +49,6 @@ public void setDefaultDateDisplayInherited(boolean enable)
setInherited("defaultDateFormatInherited", enable);
}

public String getDefaultDateDisplay()
{
return getSelectedOptionValue(elementCache().defaultDateFormat);
}

public void setDefaultDateDisplay(DATE_FORMAT dateFormat)
{
selectOptionByValue(elementCache().defaultDateFormat, dateFormat.toString());
}

public boolean defaultDateDisplayWarning()
{
return elementCache().nonStandardWarning(elementCache().defaultDateFormat).isDisplayed();
}

public void setDefaultDateTimeDisplay(BaseSettingsPage.DATE_FORMAT dateFormat, BaseSettingsPage.TIME_FORMAT timeFormat)
{
setDefaultDateTimeDateDisplay(dateFormat);
setDefaultDateTimeTimeDisplay(timeFormat);
}

public String getDefaultDateTimeDateDisplay()
{
return getSelectedOptionValue(elementCache().defaultDateTimeDateFormat);
}

public void setDefaultDateTimeDateDisplay(BaseSettingsPage.DATE_FORMAT dateFormat)
{
selectOptionByValue(elementCache().defaultDateTimeDateFormat, dateFormat.toString());
}

public boolean defaultDateTimeDateDisplayWarning()
{
return elementCache().nonStandardWarning(elementCache().defaultDateTimeDateFormat).isDisplayed();
}

public boolean getDefaultTimeDisplayInherited()
{
return getInherited("defaultTimeFormatInherited");
Expand All @@ -96,21 +59,6 @@ public void setDefaultTimeDisplayInherited(boolean enable)
setInherited("defaultTimeFormatInherited", enable);
}

public String getDefaultDateTimeTimeDisplay()
{
return getSelectedOptionValue(elementCache().defaultDateTimeTimeFormat);
}

public void setDefaultDateTimeTimeDisplay(BaseSettingsPage.TIME_FORMAT timeFormat)
{
selectOptionByValue(elementCache().defaultDateTimeTimeFormat, timeFormat.toString());
}

public boolean defaultDateTimeTimeDisplayWarning()
{
return elementCache().nonStandardWarning(elementCache().defaultDateTimeTimeFormat).isDisplayed();
}

public boolean getDefaultDateTimeDisplayInherited()
{
return getInherited("defaultDateTimeFormatInherited");
Expand All @@ -121,21 +69,6 @@ public void setDefaultDateTimeDisplayInherited(boolean enable)
setInherited("defaultDateTimeFormatInherited", enable);
}

public String getDefaultTimeDisplay()
{
return getSelectedOptionValue(elementCache().defaultTimeFormat);
}

public void setDefaultTimeDisplay(BaseSettingsPage.TIME_FORMAT timeFormat)
{
selectOptionByValue(elementCache().defaultTimeFormat, timeFormat.toString());
}

public boolean defaultTimeDisplayWarning()
{
return elementCache().nonStandardWarning(elementCache().defaultTimeFormat).isDisplayed();
}

public boolean getDefaultNumberDisplayInherited()
{
return getInherited("defaultNumberFormatInherited");
Expand All @@ -146,16 +79,6 @@ public void setDefaultNumberDisplayInherited(boolean enable)
setInherited("defaultNumberFormatInherited", enable);
}

public String getDefaultNumberDisplay()
{
return getFormElement(elementCache().defaultNumberFormat);
}

public void setDefaultNumberDisplay(String numberFormat)
{
setFormElement(elementCache().defaultNumberFormat, numberFormat);
}

public boolean getAdditionalParsingPatternDatesInherited()
{
return getInherited("extraDateParsingPatternInherited");
Expand All @@ -166,16 +89,6 @@ public void setAdditionalParsingPatternDatesInherited(boolean enable)
setInherited("extraDateParsingPatternInherited", enable);
}

public String getAdditionalParsingPatternDates()
{
return getFormElement(elementCache().additionalParsingPatternDates);
}

public void setAdditionalParsingPatternDates(String pattern)
{
setFormElement(elementCache().additionalParsingPatternDates, pattern);
}

public boolean getAdditionalParsingPatternDateAndTimeInherited()
{
return getInherited("extraDateTimeParsingPatternInherited");
Expand All @@ -186,16 +99,6 @@ public void setAdditionalParsingPatternDateAndTimeInherited(boolean enable)
setInherited("extraDateTimeParsingPatternInherited", enable);
}

public String getAdditionalParsingPatternDateAndTime()
{
return getFormElement(elementCache().additionalParsingPatternDateAndTime);
}

public void setAdditionalParsingPatternDateAndTime(String pattern)
{
setFormElement(elementCache().additionalParsingPatternDateAndTime, pattern);
}

public boolean getAdditionalParsingPatternTimesInherited()
{
return getInherited("extraTimeParsingPatternInherited");
Expand All @@ -206,16 +109,6 @@ public void setAdditionalParsingPatternTimesInherited(boolean enable)
setInherited("extraTimeParsingPatternInherited", enable);
}

public String getAdditionalParsingPatternTimes()
{
return getFormElement(elementCache().additionalParsingPatternTimes);
}

public void setAdditionalParsingPatternTimes(String pattern)
{
setFormElement(elementCache().additionalParsingPatternTimes, pattern);
}

public boolean getRestrictChartingColsInherited()
{
return getInherited("restrictedColumnsEnabledInherited");
Expand All @@ -226,22 +119,9 @@ public void setRestrictChartingColsInherited(boolean enable)
setInherited("restrictedColumnsEnabledInherited", enable);
}

public void setRestrictChartingCols(boolean restrict)
{
if (restrict)
checkCheckbox(elementCache().restrictChartingColsChk);
else
uncheckCheckbox(elementCache().restrictChartingColsChk);
}

public boolean getRestrictChartingCols()
{
return elementCache().restrictChartingColsChk.isSelected();
}

public FolderFormatsPage clickSave()
{
clickAndWait(elementCache().saveButton);
super.save();
clearCache();
return this;
}
Expand All @@ -254,44 +134,24 @@ public FolderFormatsPage clickInheritAll()
}

@Override
protected ElementCache newElementCache()
protected ElementCache elementCache()
{
return new ElementCache();
return (ElementCache) super.elementCache();
}

@Override
protected ElementCache elementCache()
protected ElementCache newElementCache()
{
return (ElementCache) super.elementCache();
return new ElementCache();
}

protected class ElementCache extends FolderManagementPage.ElementCache
protected class ElementCache extends BaseSettingsPage.ElementCache
{
WebElement inheritedChk(String name)
{
return Locator.checkboxByName(name).findWhenNeeded(this);
}

WebElement defaultDateFormat = Locator.id("defaultDateFormat").findWhenNeeded(this);
WebElement defaultTimeFormat = Locator.id("defaultTimeFormat").findWhenNeeded(this);
WebElement defaultDateTimeDateFormat = Locator.id("dateSelect").findWhenNeeded(this);
WebElement defaultDateTimeTimeFormat = Locator.id("timeSelect").findWhenNeeded(this);
WebElement formatWarningBanner = Locator.tagWithId("div", "dateFormatWarning").findWhenNeeded(this);

WebElement nonStandardWarning(WebElement field)
{
String id = field.getAttribute("id");
String xpath = String.format("//select[@id='%s']/following-sibling::span[@class='has-warning']", id);
return Locator.xpath(xpath).findWhenNeeded(this);
}

WebElement defaultNumberFormat = Locator.inputByNameContaining("defaultNumberFormat").findWhenNeeded(this);
WebElement additionalParsingPatternDates = Locator.inputByNameContaining("extraDateParsingPattern").findElement(this);
WebElement additionalParsingPatternTimes = Locator.inputByNameContaining("extraTimeParsingPattern").findElement(this);
WebElement additionalParsingPatternDateAndTime = Locator.inputByNameContaining("extraDateTimeParsingPattern").findElement(this);
WebElement restrictChartingColsChk = Locator.checkboxByName("restrictedColumnsEnabled").findWhenNeeded(this);

WebElement saveButton = Locator.lkButton("Save").findWhenNeeded(this);
WebElement inheritAll = Locator.lkButton("Inherit All").findWhenNeeded(this);

}
Expand Down
1 change: 1 addition & 0 deletions src/org/labkey/test/pages/core/admin/BaseSettingsPage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,7 @@ WebElement nonStandardWarning(WebElement field)
WebElement defaultNumberFormat = Locator.inputByNameContaining("defaultNumberFormat").findWhenNeeded(this);
// TODO: remove the next three (additionalParsingPattern*) once feature is removed.
// They are used only by ParsingPatternForDateTest.
// Until then these will only appear on the page if the "extraDateTimeParsingPatterns" deprecated feature is enabled.
WebElement additionalParsingPatternDates = Locator.inputByNameContaining("extraDateParsingPattern").findWhenNeeded(this);
WebElement additionalParsingPatternTimes = Locator.inputByNameContaining("extraTimeParsingPattern").findWhenNeeded(this);
WebElement additionalParsingPatternDateAndTime = Locator.inputByNameContaining("extraDateTimeParsingPattern").findWhenNeeded(this);
Expand Down
Loading

0 comments on commit 632c744

Please sign in to comment.