Skip to content

Commit 7b5d7f8

Browse files
authored
Use data-flagId attribute (#2466)
1 parent a0a1ade commit 7b5d7f8

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ public int getColumnCount()
246246

247247
public boolean hasSummaryStatisticRow()
248248
{
249-
return Locator.css("tr.labkey-col-total").findElements(elementCache()).size() > 0;
249+
return !Locator.css("tr.labkey-col-total").findElements(elementCache()).isEmpty();
250250
}
251251

252252
/**
@@ -457,7 +457,7 @@ public int getColumnIndex(String name)
457457
if (i < 0)
458458
{
459459
List<String> columnLabelsWithoutSpaces = new ArrayList<>(getColumnLabels().size());
460-
getColumnLabels().stream().forEach(s -> columnLabelsWithoutSpaces.add(s.replace(" ", "")));
460+
getColumnLabels().forEach(s -> columnLabelsWithoutSpaces.add(s.replace(" ", "")));
461461
i = columnLabelsWithoutSpaces.indexOf(name.replace(" ", ""));
462462
if (i >= 0)
463463
{
@@ -825,7 +825,7 @@ public boolean hasHref(int row, String columnName)
825825
public WebElement getFlag(int row, String columnName)
826826
{
827827
var cell = findCell(row, columnName);
828-
return tagWithAttribute("i", "flagid").findElement(cell);
828+
return tagWithAttribute("i", "data-flagid").findElement(cell);
829829
}
830830

831831
public boolean isFlagEnabled(int row, String columnName)
@@ -913,7 +913,7 @@ public void clearFlagValue(int row, String columnName)
913913
*/
914914
public void clearFlagValues()
915915
{
916-
List<WebElement> allFlags = Locator.tagWithAttribute("i", "flagid").findElements(elementCache());
916+
List<WebElement> allFlags = Locator.tagWithAttribute("i", "data-flagid").findElements(elementCache());
917917
for (WebElement flag : allFlags)
918918
{
919919
if (isFlagEnabled(flag))

0 commit comments

Comments
 (0)