Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add test coverage for "Equals All Of" sample finder filter type #1790

Merged
merged 1 commit into from
Jan 15, 2024
Merged

Add test coverage for "Equals All Of" sample finder filter type #1790

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 21 additions & 14 deletions src/org/labkey/test/components/ui/search/FilterExpressionPanel.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,16 +53,16 @@ public WebDriver getDriver()
*/
public void setFilter(Expression expression)
{
setFilter(0, expression);
setFilter(0, expression._operator, expression._value1, expression._value2);
}

/**
* Set both filter expressions
*/
public void setFilters(Expression expression0, Expression expression1)
{
setFilter(0, expression0);
setFilter(1, expression1);
setFilter(0, expression0._operator, expression0._value1, expression0._value2);
setFilter(1, expression1._operator, expression1._value1, expression1._value2);
}

public void clearFilter()
Expand All @@ -74,12 +74,8 @@ public void clearFilter()
elementCache().filterTypeSelects.get(0).clearSelection();
}

private void setFilter(int index, Expression expression)
public void setFilter(int index, Object operator, Object value1, Object value2)
{
Operator operator = expression._operator;
Object value1 = expression._value1;
Object value2 = expression._value2;

setFilterType(index, operator);
if (value1 != null)
{
Expand Down Expand Up @@ -121,16 +117,27 @@ else if (value2 != null)
}
}

private void setFilterType(int index, Operator operator)
private void setFilterType(int index, Object op)
{
if (filterTypesLabelOverrides.containsKey(operator))
if (op instanceof Operator operator)
{
elementCache().filterTypeSelects.get(index).select(filterTypesLabelOverrides.get(operator));
if (filterTypesLabelOverrides.containsKey(operator))
{
elementCache().filterTypeSelects.get(index).select(filterTypesLabelOverrides.get(operator));
}
else
{
elementCache().filterTypeSelects.get(index).select(operator.getDisplayValue());
}
}
else
{
elementCache().filterTypeSelects.get(index).select(operator.getDisplayValue());
}
elementCache().filterTypeSelects.get(index).select(op.toString());

}

public boolean hasFilterType(int index, String filterCaption)
{
return elementCache().filterTypeSelects.get(index).getOptions().contains(filterCaption);
}

@Override
Expand Down