Skip to content

Commit 78e7084

Browse files
committed
fix test failure
1 parent 5c20403 commit 78e7084

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

src/org/labkey/test/components/ui/search/FilterFacetedPanel.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,12 @@
1313
import org.openqa.selenium.WebElement;
1414
import org.openqa.selenium.support.ui.ExpectedConditions;
1515

16+
import java.io.IOException;
17+
import java.util.Arrays;
1618
import java.util.List;
1719
import java.util.stream.Collectors;
1820

21+
import static org.labkey.test.WebDriverWrapper.waitFor;
1922
import static org.labkey.test.components.html.Input.Input;
2023

2124
public class FilterFacetedPanel extends WebDriverComponent<FilterFacetedPanel.ElementCache>
@@ -74,9 +77,15 @@ public boolean isChecked(String value)
7477
*/
7578
public void checkValues(String... values)
7679
{
80+
// waitForElement(elementCache().findCheckbox(values[0]));
81+
// waitFor(() -> elementCache().findCheckbox(values[0]).isDisplayed(), 10000);
7782
for (String value : values)
7883
{
79-
elementCache().findCheckbox(value).check();
84+
try{
85+
elementCache().findCheckbox(value).check();}
86+
catch (Exception e){
87+
elementCache().findCheckbox(value).check();
88+
}
8089
}
8190
}
8291

src/org/labkey/test/util/TestDataGenerator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ public static List<String> randomTextChoice(int size)
504504
List<String> textChoices = new ArrayList<>();
505505
for (int i = 0; i < size; i++)
506506
{
507-
textChoices.add(randomString(randomInt(0, 30)));
507+
textChoices.add(randomString(randomInt(1, 25)));
508508
}
509509
return textChoices;
510510
}

src/org/labkey/test/util/data/TestArrayDataUtils.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@ public static<T> Map<String, T> getMapWithIdAndMultiChoiceField(List<Map<String,
3434
*/
3535
public static <T> Map<String, String> filterMap(Map<String, T> map, List<String> searchValues, Filter.Operator filterType)
3636
{
37-
Comparator<String> comparator = Comparator.comparing((String s) -> s.toLowerCase()).thenComparing(s -> s);
3837
return map.entrySet().stream()
3938
.filter(entry -> entry.getValue() instanceof List)
4039
.map(entry -> Map.entry(entry.getKey(), (List<String>) entry.getValue()))
4140
.filter(entry -> isMatch(entry.getValue(), searchValues, filterType))
4241
.collect(Collectors.toMap(
4342
Map.Entry::getKey,
4443
e -> e.getValue().stream()
45-
.sorted(comparator)
44+
.sorted(Comparator.comparing(String::toLowerCase))
4645
.collect(Collectors.joining(", ")),
4746
(e1, e2) -> e1,
4847
LinkedHashMap::new

0 commit comments

Comments
 (0)