Skip to content

Add more informative errors for null ElementCache #2593

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

Closed
labkey-tchad wants to merge 3 commits into from
Closed

Add more informative errors for null ElementCache #2593

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
309a00c
Add more informative errors for null ElementCache
labkey-tchad Jul 30, 2025
a21be8b
Add NotNull annotations to make IntelliJ happy
labkey-tchad Jul 30, 2025
0659706
Merge remote-tracking branch 'origin/develop' into fb_plateEditorNpe
labkey-tchad Aug 1, 2025
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
13 changes: 8 additions & 5 deletions src/org/labkey/test/components/Component.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
package org.labkey.test.components;

import org.apache.commons.lang3.NotImplementedException;
import org.jetbrains.annotations.NotNull;
import org.labkey.test.Locator;
import org.labkey.test.selenium.RefindingWebElement;
import org.labkey.test.util.TestLogger;
Expand All @@ -27,6 +28,7 @@

import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.Optional;
import java.util.function.Function;

Expand All @@ -43,13 +45,13 @@ public String toString()
}

@Override
public WebElement findElement(By by)
public @NotNull WebElement findElement(@NotNull By by)
{
return getComponentElement().findElement(by);
}

@Override
public List<WebElement> findElements(By by)
public @NotNull List<WebElement> findElements(@NotNull By by)
{
return getComponentElement().findElements(by);
}
Expand All @@ -69,8 +71,9 @@ protected EC elementCache()
// Pass if element doesn't exist. Might be checking if component is visible.
}

_elementCache = newElementCache();
_elementCache = Objects.requireNonNull(newElementCache());
waitForReady();
Objects.requireNonNull(_elementCache, "waitForReady() cleared the element cache");
}
return _elementCache;
}
Expand Down Expand Up @@ -103,13 +106,13 @@ protected ElementCache()
}

@Override
public List<WebElement> findElements(By by)
public @NotNull List<WebElement> findElements(@NotNull By by)
{
return getComponentElement().findElements(by);
}

@Override
public WebElement findElement(By by)
public @NotNull WebElement findElement(@NotNull By by)
{
return getComponentElement().findElement(by);
}
Expand Down